diff --git a/code/Subsite.php b/code/Subsite.php
index 73fb7e1..536439c 100644
--- a/code/Subsite.php
+++ b/code/Subsite.php
@@ -13,7 +13,8 @@ class Subsite extends DataObject implements PermissionProvider {
 	 */
 	static $disable_subsite_filter = false;
 
-	static $default_sort = "\"Title\"";
+	static $write_hostmap = true;
+	static $default_sort = 'Title';
 
 	static $db = array(
 		'Title' => 'Varchar(255)',
@@ -469,6 +470,8 @@ JS;
 	 * @return void
 	 */
 	static function writeHostMap($file = null) {
+		if (!self::$write_hostmap) return;
+		
 		if (!$file) $file = Director::baseFolder().'/subsites/host-map.php';
 		$hostmap = array();
 		
@@ -506,7 +509,8 @@ JS;
 		return array(
 			'SUBSITE_EDIT' => 'Edit Sub-site Details',
 			'SUBSITE_ACCESS_ALL' => 'Access all subsites',
-			'SUBSITE_ASSETS_EDIT' => 'Edit Sub-site Assets Admin'
+			'SUBSITE_ASSETS_EDIT' => 'Edit Sub-site Assets Admin',
+			'SUBSITE_ASSETS_CREATE_SUBSITE' => 'Create/edit sub-site specific asset folders'
 		);
 	}
 
diff --git a/tests/SubsiteAdminTest.php b/tests/SubsiteAdminTest.php
index 7cafeab..f4381f2 100644
--- a/tests/SubsiteAdminTest.php
+++ b/tests/SubsiteAdminTest.php
@@ -13,6 +13,7 @@ class SubsiteAdminTest extends SapphireTest {
      * Test generation of the view
      */
     function testBasicView() {
+		Subsite::$write_hostmap = false;
         // Open the admin area logged in as admin
         $response1 = Director::test('admin/subsites/', null, $this->adminLoggedInSession());
         
diff --git a/tests/SubsiteTest.php b/tests/SubsiteTest.php
index ffc0639..dd95e98 100644
--- a/tests/SubsiteTest.php
+++ b/tests/SubsiteTest.php
@@ -37,6 +37,8 @@ class SubsiteTest extends SapphireTest {
 	 * Create a new subsite from the template and verify that all the template's pages are copied
 	 */
 	function testSubsiteCreation() {
+		Subsite::$write_hostmap = false;
+		
 		// Create the instance
 		$template = $this->objFromFixture('Subsite_Template', 'main');
 	
diff --git a/tests/SubsitesVirtualPageTest.php b/tests/SubsitesVirtualPageTest.php
index e49eb2f..fd43bf3 100644
--- a/tests/SubsitesVirtualPageTest.php
+++ b/tests/SubsitesVirtualPageTest.php
@@ -5,6 +5,8 @@ class SubsitesVirtualPageTest extends SapphireTest {
 	
 	// Attempt to bring main:linky to subsite2:linky
 	function testVirtualPageFromAnotherSubsite() {
+		Subsite::$write_hostmap = false;
+		
 		$subsite = $this->objFromFixture('Subsite_Template', 'subsite2');
 		
 		Subsite::changeSubsite($subsite->ID);