diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php
index 93814390c..186d6a129 100755
--- a/core/model/SiteTree.php
+++ b/core/model/SiteTree.php
@@ -2017,7 +2017,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
 	}
 	
 	static function generate_homepage_domain_map() {
-		$domainSpecificHomepages = Versioned::get_by_stage('Page', 'Live', "HomepageForDomain != ''", 'URLSegment ASC');
+		$domainSpecificHomepages = Versioned::get_by_stage('Page', 'Live', "\"HomepageForDomain\" != ''", "\"URLSegment\" ASC");
 		if (!$domainSpecificHomepages) return false;
 		
 		$map = array();
diff --git a/core/model/VirtualPage.php b/core/model/VirtualPage.php
index 48264708b..b5186dadd 100755
--- a/core/model/VirtualPage.php
+++ b/core/model/VirtualPage.php
@@ -149,8 +149,8 @@ class VirtualPage extends Page {
 			&& Versioned::current_stage() == 'Live') {
 			$performCopyFrom = true;
 			
-			$stageSourceVersion = DB::query("SELECT Version FROM SiteTree WHERE ID = $this->CopyContentFromID")->value();
-			$liveSourceVersion = DB::query("SELECT Version FROM SiteTree_Live WHERE ID = $this->CopyContentFromID")->value();
+			$stageSourceVersion = DB::query("SELECT \"Version\" FROM \"SiteTree\" WHERE \"ID\" = $this->CopyContentFromID")->value();
+			$liveSourceVersion = DB::query("SELECT \"Version\" FROM \"SiteTree_Live\" WHERE \"ID\" = $this->CopyContentFromID")->value();
 			
 			// We're going to create a new VP record in SiteTree_versions because the published
 			// version might not exist, unless we're publishing the latest version