diff --git a/db_datadict.php b/db_datadict.php
index 8fa41c8488..1d2ee54ecb 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -133,6 +133,7 @@ foreach ($tables as $table) {
         }
     } else {
         $have_rel = false;
+        $res_rel = array();
     } // end if
 
 
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 86982a418c..231784b585 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -1433,7 +1433,6 @@ function PMA_getRelatives($all_tables, $master)
 
     if ($ignore_internal_relations) {
         $emerg = '';
-        $remaining_tables = array();
     }
 
     // Build the 'FROM' clause.
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index a1f47b5174..030d2d023c 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -198,6 +198,7 @@ function PMA_getHtmlForSlaveConfiguration(
             . PMA_URL_getCommon($_url_params);
 
         $_url_params = $GLOBALS['url_params'];
+        $_url_params['sr_take_action'] = true;
         $_url_params['sr_slave_skip_error'] = true;
         $slave_skip_error_link = 'server_replication.php'
             . PMA_URL_getCommon($_url_params);