diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index fa870cc8124..ae7f0c87021 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -9,6 +9,7 @@ filter:
     paths: [application/*]
     excluded_paths: 
         - 'application/views/*'
+        - 'framework/yiilite.php'
     dependency_paths:
         - 'framework/'
         - 'application/helpers/adodb/*'
diff --git a/application/controllers/AdminController.php b/application/controllers/AdminController.php
index f2152024d9f..5b160fd0a2f 100644
--- a/application/controllers/AdminController.php
+++ b/application/controllers/AdminController.php
@@ -203,7 +203,7 @@ public function getActionClasses()
         'index'            => 'index',
         'labels'           => 'labels',
         'participants'     => 'participantsaction',
-        'pluginmanager'    => 'pluginmanager',
+        'pluginmanager'    => 'PluginManagerController',
         'printablesurvey'  => 'printablesurvey',
         'questiongroups'    => 'questiongroups',
         'questions'         => 'questions',
diff --git a/application/controllers/admin/pluginmanager.php b/application/controllers/admin/PluginManagerController.php
similarity index 99%
rename from application/controllers/admin/pluginmanager.php
rename to application/controllers/admin/PluginManagerController.php
index f5971f15ce3..7af7debee27 100644
--- a/application/controllers/admin/pluginmanager.php
+++ b/application/controllers/admin/PluginManagerController.php
@@ -2,7 +2,7 @@
 
 /**
  */
-class PluginManager extends Survey_Common_Action
+class PluginManagerController extends Survey_Common_Action
 {
     public function init()
     {
diff --git a/application/libraries/admin/settingsstorage.php b/application/libraries/admin/settingsstorage.php
index acbf783a940..3762be69f89 100644
--- a/application/libraries/admin/settingsstorage.php
+++ b/application/libraries/admin/settingsstorage.php
@@ -62,14 +62,4 @@ public static function isRegistered($index)
         return self::$_instance->offsetExists($index);
     }
 
-    /**
-     * Workaround for http://bugs.php.net/bug.php?id=40442 (ZF-960).
-     */
-    public function offsetExists($index)
-    {
-        return array_key_exists($index, $this);
-    }
-
-
 }
-?>