diff --git a/core/Controller.php b/core/Controller.php
index 42ee917d23cdba125b77696e894a490931b1cb3f..ec631e811b17c88dd32f1b9bca893e8c34d430c9 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -358,6 +358,7 @@ abstract class Piwik_Controller
 			$this->setBasicVariablesView($view);
 		} catch(Exception $e) {
 			//TODO here display std error message rather than redirect
+			//echo $e->getMessage();exit;
 			self::redirectToIndex( Piwik::getLoginPluginName(), $action = 'index' );
 		}
 	}
diff --git a/core/FrontController.php b/core/FrontController.php
index 7d3640bb411db9b135006978400ba485a6065b19..b97829bfb4b2354872777d0507898568d0150a4c 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -163,6 +163,7 @@ class Piwik_FrontController
 		try {
 			Piwik::printSqlProfilingReportZend();
 			Piwik::printQueryCount();
+			Piwik::printTimer();
 		} catch(Exception $e) {}
 	}
 	
diff --git a/core/Piwik.php b/core/Piwik.php
index 8c35b2229842d709eac0e4d6d15e87968b75a0fb..6c446e3753b38ec39e4e1f0ef08ed3a46c554a35 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -1072,7 +1072,7 @@ class Piwik
 	 */
 	static public function printTimer()
 	{
-		echo Zend_Registry::get('timer');
+		Piwik::log(Zend_Registry::get('timer'));
 	}
 
 	/**
diff --git a/piwik.php b/piwik.php
index 42a7b27a236d33e0b6f0be929ab8230ee6ab69cc..714574c5713d5132cdad9fb8db3ba68076aa0bd4 100644
--- a/piwik.php
+++ b/piwik.php
@@ -58,7 +58,7 @@ if($GLOBALS['PIWIK_TRACKER_DEBUG'] === true)
 	$timer = new Piwik_Timer();
 	set_error_handler('Piwik_ErrorHandler');
 	set_exception_handler('Piwik_ExceptionHandler');
-	printDebug("Input parameters: <br/>" . var_export($_GET, true));
+	printDebug("Debug enabled - Input parameters: <br/>" . var_export($_GET, true));
 	Piwik_Tracker_Db::enableProfiling();
 	// Config might have been created by proxy-piwik.php
 	try {
@@ -81,3 +81,4 @@ if(!defined('PIWIK_ENABLE_TRACKING') || PIWIK_ENABLE_TRACKING)
 		printDebug($timer);
 	}
 }
+
diff --git a/plugins/CoreUpdater/templates/update_welcome.tpl b/plugins/CoreUpdater/templates/update_welcome.tpl
index a926274dd302f9c3303a0e5fad0fff7b553f19f5..f12c731dbde142da2a5fb221510f24285431c9b7 100644
--- a/plugins/CoreUpdater/templates/update_welcome.tpl
+++ b/plugins/CoreUpdater/templates/update_welcome.tpl
@@ -30,7 +30,7 @@
 		<h4>{'CoreUpdater_NoteForLargePiwikInstances'|translate}</h4>
 		<ul>
 		<li>{'CoreUpdater_TheUpgradeProcessMayFailExecuteCommand'|translate:$commandUpgradePiwik}</li>
-		<li>It is also recommended, for high traffic Piwik servers, to <a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/faq/how-to/#faq_111'>momentarily disable visitor Tracking and put the Piwik User Interface in maintenance mode</a>.</li>
+		<li>It is also recommended for high traffic Piwik servers to <a target='_blank' href='?module=Proxy&action=redirect&url={"http://piwik.org/faq/how-to/#faq_111"|escape:"url"}'>momentarily disable visitor Tracking and put the Piwik User Interface in maintenance mode</a>.</li>
 		<li>{'CoreUpdater_YouCouldManuallyExecuteSqlQueries'|translate}<br />
 			<a href='#' id='showSql' style='margin-left:20px'>› {'CoreUpdater_ClickHereToViewSqlQueries'|translate}</a>
 		<div id='sqlQueries' style='display:none'>
diff --git a/plugins/SitesManager/tests/SitesManager.test.php b/plugins/SitesManager/tests/SitesManager.test.php
index 012fa7d5708e2a5f43b3cf7976eb6af8f30b7c2b..11e6864c6c9f1cc66a3632e80e26de657b6b126c 100644
--- a/plugins/SitesManager/tests/SitesManager.test.php
+++ b/plugins/SitesManager/tests/SitesManager.test.php
@@ -26,6 +26,11 @@ class Test_Piwik_SitesManager extends Test_Database
 		Piwik_Site::clearCache();
     }
     
+    public function tearDown()
+    {
+		Piwik_Site::clearCache();
+    }
+    
     /**
      * empty name -> exception
      */