diff --git a/e107_handlers/Shims/eShims.php b/e107_handlers/Shims/eShims.php
index d01779289..7031e5703 100644
--- a/e107_handlers/Shims/eShims.php
+++ b/e107_handlers/Shims/eShims.php
@@ -10,9 +10,6 @@
  */
 
 // e107 v2-style classes
-namespace
+class eShims extends \e107\Shims\AllShims
 {
-	class eShims extends \e107\Shims\AllShims
-	{
-	}
 }
\ No newline at end of file
diff --git a/e107_handlers/e_file_inspector.php b/e107_handlers/e_file_inspector.php
index 854bc9940..1e4a0474a 100644
--- a/e107_handlers/e_file_inspector.php
+++ b/e107_handlers/e_file_inspector.php
@@ -87,7 +87,7 @@ abstract class e_file_inspector implements e_file_inspector_interface
 
     /**
      * Populate insecureFiles list if deprecatedFiles.log found.
-     * @return |null
+     * @return void
      */
     private function checkDeprecatedFilesLog()
     {
@@ -95,14 +95,14 @@ abstract class e_file_inspector implements e_file_inspector_interface
 
         if(!file_exists($log))
         {
-            return null;
+            return;
         }
 
         $content = file_get_contents($log);
 
         if(empty($content))
         {
-            return null;
+            return;
         }
 
        $tmp = explode("\n", $content);