diff --git a/code/forms/FolderUnusedAssetsField.php b/code/forms/FolderUnusedAssetsField.php
index 35ff707b..e174608f 100644
--- a/code/forms/FolderUnusedAssetsField.php
+++ b/code/forms/FolderUnusedAssetsField.php
@@ -45,7 +45,7 @@ class Folder_UnusedAssetsField extends CompositeField {
      */
 	protected function getAssetList() {
 		$where = $this->folder->getUnusedFilesListFilter();
-		$files = DataList::create('File')->where($where);
+		$files = File::get()->where($where);
 		$field = new GridField('AssetList', false, $files);
 		return $field;
 	}
diff --git a/code/model/SiteConfig.php b/code/model/SiteConfig.php
index 6ad68ca5..758e0483 100644
--- a/code/model/SiteConfig.php
+++ b/code/model/SiteConfig.php
@@ -44,7 +44,7 @@ class SiteConfig extends DataObject implements PermissionProvider {
 	function getCMSFields() {
 		Requirements::javascript(CMS_DIR . "/javascript/SitetreeAccess.js");
 
-		$groupsMap = DataList::create('Group')->map('ID', 'Breadcrumbs')->toArray();
+		$groupsMap = Group::get()->map('ID', 'Breadcrumbs')->toArray();
 		asort($groupsMap);
 
 		$fields = new FieldList(
diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php
index ea8ffe7b..212e40cb 100644
--- a/code/model/SiteTree.php
+++ b/code/model/SiteTree.php
@@ -1894,7 +1894,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 	 * @return FieldList
 	 */
 	function getSettingsFields() {
-		$groupsMap = DataList::create('Group')->map('ID', 'Breadcrumbs')->toArray();
+		$groupsMap = Group::get()->map('ID', 'Breadcrumbs')->toArray();
 		asort($groupsMap);
 		
 		$fields = new FieldList(