diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php
index 739060ea83..29cb1483c0 100644
--- a/libraries/Advisor.class.php
+++ b/libraries/Advisor.class.php
@@ -353,7 +353,7 @@ class Advisor
      */
     static function parseRulesFile()
     {
-        $file = file('libraries/advisory_rules.txt');
+        $file = file('libraries/advisory_rules.txt', FILE_IGNORE_NEW_LINES);
         $errors = array();
         $rules = array();
         $lines = array();
@@ -367,7 +367,7 @@ class Advisor
 
         for ($i = 0; $i < $numLines; $i++) {
             $line = $file[$i];
-            if ($line[0] == '#' || $line[0] == "\n") {
+            if ($line == "" || $line[0] == '#') {
                 continue;
             }
 
diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
index 5b88708012..78c2237b9d 100644
--- a/libraries/config/FormDisplay.tpl.php
+++ b/libraries/config/FormDisplay.tpl.php
@@ -328,7 +328,7 @@ function PMA_displayInput($path, $name, $type, $value, $description = '',
     if ($is_setup_script && isset($opts['userprefs_allow'])) {
         echo '<td class="userprefs-allow" title="' .
             __('Allow users to customize this value') . '">';
-        echo '<input type="checkbox" name="' . $path . '>-userprefs-allow" ';
+        echo '<input type="checkbox" name="' . $path . '-userprefs-allow" ';
         if ($opts['userprefs_allow']) {
             echo 'checked="checked"';
         };
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index c94d8ae4ca..58b233e296 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -123,7 +123,7 @@ function PMA_DBI_query($query, $link = null, $options = 0,
  *
  * @return void
  */
-function PMA_DBI_DBG_query($query, $result, $time)
+function PMA_DBI_DBG_query($query, $link, $result, $time)
 {
     $hash = md5($query);
 
@@ -190,7 +190,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0,
 
     if ($GLOBALS['cfg']['DBG']['sql']) {
         $time = microtime(true) - $time;
-        PMA_DBI_DBG_query($query, $result, $time);
+        PMA_DBI_DBG_query($query, $link, $result, $time);
 
     }
     if ($result != false && PMA_Tracker::isActive() == true ) {