diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index e427ebe3..2afe4df9 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -55,6 +55,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		}
 		
 		parent::init();
+
+		Versioned::reading_stage("Stage");
 		
 		Requirements::css(CMS_DIR . '/css/screen.css');
 		Requirements::customCSS($this->generatePageIconsCss());
@@ -790,6 +792,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 	public function currentPageID() {
 		$id = parent::currentPageID();
 		
+		$this->extend('updateCurrentPageID', $id);
+
 		// Fall back to homepage record
 		if(!$id) {
 			$homepageSegment = RootURLController::get_homepage_link();
diff --git a/tests/controller/ContentControllerSearchExtensionTest.php b/tests/controller/ContentControllerSearchExtensionTest.php
index cf791770..9578d5f2 100644
--- a/tests/controller/ContentControllerSearchExtensionTest.php
+++ b/tests/controller/ContentControllerSearchExtensionTest.php
@@ -1,9 +1,7 @@
 <?php
 class ContentControllerSearchExtensionTest extends SapphireTest {
-	
+
 	public function testCustomSearchFormClassesToTest() {
-		FulltextSearchable::enable('File');
-		
 		$page = new Page();
 		$page->URLSegment = 'whatever';
 		$page->Content = 'oh really?';
@@ -14,4 +12,23 @@ class ContentControllerSearchExtensionTest extends SapphireTest {
 		
 		if (get_class($form) == 'SearchForm') $this->assertEquals(array('File'), $form->getClassesToSearch());
 	}
+
+	public function setUpOnce() {
+		parent::setUpOnce();
+
+		FulltextSearchable::enable('File');
+	}
+
+	/**
+	 * FulltextSearchable::enable() leaves behind remains that don't get cleaned up
+	 * properly at the end of the test. This becomes apparent when a later test tries to
+	 * ALTER TABLE File and add fulltext indexes with the InnoDB table type.
+	 */
+	public function tearDownOnce() {
+		parent::tearDownOnce();
+
+		Config::inst()->update('File', 'create_table_options', array('MySQLDatabase' => 'ENGINE=InnoDB'));
+		File::remove_extension('FulltextSearchable');
+	}
+
 }