diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index 9aab2584b3c1690fcdfd4e482c58688b5008d434..5e3704475a31327f72c0c38401ccfdb4011ef988 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -736,7 +736,7 @@ abstract class Controller
             Piwik_ExitWithMessage($errorMessage, false, true);
         }
 
-        FrontController::getInstance()->dispatch(Piwik::getLoginPluginName(), false);
+        echo FrontController::getInstance()->dispatch(Piwik::getLoginPluginName(), false);
         exit;
     }
 
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 441cae6b85ababc3e09218be36d1d5cb6d1a338a..8792b833542d639ade307df047b4ad1d2a2f350d 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -241,7 +241,7 @@ class Controller extends \Piwik\Plugin\Controller
         return $view->render();
     }
 
-    public function getEvolutionGraph(array $columns = array(), $idGoal = false)
+    public function getEvolutionGraph($fetch = false, array $columns = array(), $idGoal = false)
     {
         if (empty($columns)) {
             $columns = Common::getRequestVar('columns');
diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php
index d2472e54767bdb440b32641c61798f3e7d269ad6..1143bcbc84e097aee6502c0bd2861d5f8a7d6c14 100644
--- a/plugins/Installation/Installation.php
+++ b/plugins/Installation/Installation.php
@@ -11,6 +11,7 @@
 namespace Piwik\Plugins\Installation;
 
 use Piwik\Common;
+use Piwik\FrontController;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Piwik;
 use Piwik\Translate;
@@ -66,7 +67,7 @@ class Installation extends \Piwik\Plugin
         if (in_array($step, array_keys($controller->getInstallationSteps()))
             || $isActionWhiteListed
         ) {
-            $controller->$step($message);
+            echo FrontController::getInstance()->dispatch('Installation', $step, array($message));
         } else {
             Piwik::exitWithErrorMessage(Piwik::translate('Installation_NoConfigFound'));
         }
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 7e94eb67b42af217baf7a7b6ee52f4c822115266..6dfac3da495ffa2a49001dc01d2ff3e53cec196f 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -62,7 +62,7 @@ class Controller extends \Piwik\Plugin\Controller
      */
     function index()
     {
-        $this->login();
+        return $this->login();
     }
 
     /**
@@ -335,8 +335,7 @@ class Controller extends \Piwik\Plugin\Controller
             return;
         } else {
             // show login page w/ error. this will keep the token in the URL
-            $this->login($errorMessage);
-            return;
+            return $this->login($errorMessage);
         }
     }
 
@@ -372,7 +371,7 @@ class Controller extends \Piwik\Plugin\Controller
      */
     public function resetPasswordSuccess()
     {
-        $this->login($errorMessage = null, $infoMessage = Piwik::translate('Login_PasswordChanged'));
+        return $this->login($errorMessage = null, $infoMessage = Piwik::translate('Login_PasswordChanged'));
     }
 
     /**
diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php
index b5266b017e17888b61255ec59d48be048198a818..efd24036f1ef326acbaa86d8309faaaa39c8985b 100644
--- a/plugins/Referrers/Controller.php
+++ b/plugins/Referrers/Controller.php
@@ -146,8 +146,6 @@ class Controller extends \Piwik\Plugin\Controller
      * Returns or echo's a report that shows all search keyword, website and campaign
      * referrer information in one report.
      *
-     * @param bool $fetch True if the report HTML should be returned. If false, the
-     *                    report is echo'd and nothing is returned.
      * @return string The report HTML or nothing if $fetch is set to false.
      */
     public function getAll()
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index 3f4b994f6b4e11a5c96aefc4ff57de8c471dade1..57f25946a1bac3061de19e209fda4733f2680b62 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -29,7 +29,7 @@ class Controller extends \Piwik\Plugin\Controller
     // By default plot up to the last 30 days of visitors on the map, for low traffic sites
     const REAL_TIME_WINDOW = 'last30';
 
-    public function visitorMap($segmentOverride = false)
+    public function visitorMap($fetch = false, $segmentOverride = false)
     {
         $this->checkUserCountryPluginEnabled();