diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index bc877d55c7..018dce1551 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -353,7 +353,7 @@ if (isset($plugin_list)) {
             $columns_cnt = PMA_DBI_num_fields($result);
             $columns = array();
             for ($i = 0; $i < $columns_cnt; $i++) {
-                $columns[$i] = stripslashes(str_replace(' ', '_', PMA_DBI_field_name($result, $i)));
+                $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
             }
             unset($i);
 
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 7fa813d31c..e25a2b4056 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -940,7 +940,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql =
          *
          * $pattern = 'CREATE (TABLE|VIEW|TRIGGER|FUNCTION|PROCEDURE)';
          */
-        $pattern = '/CREATE .*(TABLE)/';
+        $pattern = '/CREATE [^`]*(TABLE)/';
         $replacement = 'CREATE \\1 IF NOT EXISTS';
 
         /* Change CREATE statements to CREATE IF NOT EXISTS to support inserting into existing structures */
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index e323d9f638..7388c33c8e 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -26,7 +26,7 @@ function PMA_getPlugins($plugins_dir, $plugin_param)
             // matches a file which does not start with a dot but ends
             // with ".php"
             if (is_file($plugins_dir . $file) && preg_match('@^[^\.](.)*\.php$@i', $file)) {
-                include $plugins_dir . $file;
+                include_once $plugins_dir . $file;
             }
         }
     }