diff --git a/libraries/Util.php b/libraries/Util.php
index 132c7b61d9..ea58e43d5b 100644
--- a/libraries/Util.php
+++ b/libraries/Util.php
@@ -3535,7 +3535,6 @@ class Util
         /* Optional escaping */
         if (! is_null($escape)) {
             if (is_array($escape)) {
-                include_once $escape[2];
                 $escape_class = new $escape[1];
                 $escape_method = $escape[0];
             }
diff --git a/libraries/navigation/NodeFactory.php b/libraries/navigation/NodeFactory.php
index bd22ac3d88..cbe80cf4c4 100644
--- a/libraries/navigation/NodeFactory.php
+++ b/libraries/navigation/NodeFactory.php
@@ -22,6 +22,7 @@ class NodeFactory
      * @access private
      */
     private static $_path = 'libraries/navigation/nodes/%s.php';
+    private static $_namespace = 'PMA\libraries\navigation\nodes\%s';
 
     /**
      * Sanitizes the name of a Node class
@@ -32,19 +33,19 @@ class NodeFactory
      */
     private static function _sanitizeClass($class)
     {
-        if ($class !== 'PMA\libraries\navigation\nodes\Node' && !preg_match('@^PMA\libraries\navigation\nodes\Node\w+(_\w+)?$@', $class)) {
-            $class = 'PMA\libraries\navigation\nodes\Node';
+        if ($class !== 'Node' && !preg_match('@^Node\w+(_\w+)?$@', $class)) {
+            $class = 'Node';
             trigger_error(
                 sprintf(
                 /* l10n: The word "Node" must not be translated here */
-                    __('Invalid class name "%1$s", using default of "PMA\libraries\navigation\nodes\Node"'),
+                    __('Invalid class name "%1$s", using default of "Node"'),
                     $class
                 ),
                 E_USER_ERROR
             );
         }
 
-        return self::_checkFile($class);
+        return sprintf(self::$_namespace, self::_checkFile($class));
     }
 
     /**
@@ -60,12 +61,12 @@ class NodeFactory
     {
         $path = sprintf(self::$_path, $class);
         if (!is_readable($path)) {
-            $class = 'PMA\libraries\navigation\nodes\Node';
+            $class = 'Node';
             trigger_error(
                 sprintf(
                     __('Could not include class "%1$s", file "%2$s" not found'),
                     $class,
-                    'Nodes/' . $class . '.php'
+                    'nodes/' . $class . '.php'
                 ),
                 E_USER_ERROR
             );
@@ -86,7 +87,7 @@ class NodeFactory
      * @return mixed
      */
     public static function getInstance(
-        $class = 'PMA\libraries\navigation\nodes\Node',
+        $class = 'Node',
         $name = 'default',
         $type = Node::OBJECT,
         $is_group = false
diff --git a/libraries/plugins/export/ExportLatex.php b/libraries/plugins/export/ExportLatex.php
index de261f7e9b..3fc6e0b361 100644
--- a/libraries/plugins/export/ExportLatex.php
+++ b/libraries/plugins/export/ExportLatex.php
@@ -334,7 +334,6 @@ class ExportLatex extends ExportPlugin
                     array(
                         'texEscape',
                         get_class($this),
-                        'libraries/plugins/export/' . get_class($this) . ".class.php",
                     ),
                     array('table' => $table_alias, 'database' => $db_alias)
                 )
@@ -373,8 +372,6 @@ class ExportLatex extends ExportPlugin
                         array(
                             'texEscape',
                             get_class($this),
-                            'libraries/plugins/export/'
-                            . get_class($this) . ".class.php",
                         ),
                         array('table' => $table_alias, 'database' => $db_alias)
                     )
@@ -547,7 +544,6 @@ class ExportLatex extends ExportPlugin
                     array(
                         'texEscape',
                         get_class($this),
-                        'libraries/plugins/export/' . get_class($this) . ".class.php",
                     ),
                     array('table' => $table_alias, 'database' => $db_alias)
                 )
@@ -569,7 +565,6 @@ class ExportLatex extends ExportPlugin
                     array(
                         'texEscape',
                         get_class($this),
-                        'libraries/plugins/export/' . get_class($this) . ".class.php",
                     ),
                     array('table' => $table_alias, 'database' => $db_alias)
                 )