diff --git a/server_status.php b/server_status.php
index 2d4a33e32c..27d3c6ad80 100644
--- a/server_status.php
+++ b/server_status.php
@@ -126,7 +126,6 @@ function getServerTrafficHtml($ServerStatusData)
                 PMA_replication_print_status_table($type);
             }
         }
-        unset($types);
     }
 
     $retval .= '<table id="serverstatustraffic" class="data noclick">';
diff --git a/server_status_queries.php b/server_status_queries.php
index 218878b2c8..01d21736b8 100644
--- a/server_status_queries.php
+++ b/server_status_queries.php
@@ -93,7 +93,6 @@ function getQueryStatisticsHtml($ServerStatusData)
     arsort($used_queries);
 
     $odd_row        = true;
-    $count_displayed_rows = 0;
     $perc_factor    = 100 / $total_queries; //(- $ServerStatusData->status['Connections']);
 
     $retval .= '<table id="serverstatusqueriesdetails" class="data sortable noclick">';
diff --git a/sql.php b/sql.php
index ac1114351e..aa397a4355 100644
--- a/sql.php
+++ b/sql.php
@@ -356,7 +356,7 @@ $displayResultsObject->setConfigParamsForDisplayTable();
  * Need to find the real end of rows?
  */
 if (isset($find_real_end) && $find_real_end) {
-    $unlim_num_rows = PMA_Table::countRecords($db, $table, $force_exact = true);
+    $unlim_num_rows = PMA_Table::countRecords($db, $table, true);
     $_SESSION['tmp_user_values']['pos'] = @((ceil(
         $unlim_num_rows / $_SESSION['tmp_user_values']['max_rows']
     ) - 1) * $_SESSION['tmp_user_values']['max_rows']);
@@ -1481,9 +1481,7 @@ function getTableHtmlForMultipleQueries(
 
             $analyzed_sql = PMA_SQP_analyze($parsed_sql);
             $is_select = isset($analyzed_sql[0]['queryflags']['select_from']);
-            $unlim_num_rows = PMA_Table::countRecords(
-                $db, $table, $force_exact = true
-            );
+            $unlim_num_rows = PMA_Table::countRecords($db, $table, true);
             $showtable = PMA_Table::sGetStatusInfo($db, $table, null, true);
             $url_query = PMA_generate_common_url($db, $table);
 
diff --git a/user_password.php b/user_password.php
index d4322c9c83..08cd45d750 100644
--- a/user_password.php
+++ b/user_password.php
@@ -174,10 +174,9 @@ function PMA_ChangePassUrlParamsAndSubmitQuery(
     $local_query = 'SET password = ' . (($password == '')
         ? '\'\''
         : $hashing_function . '(\'' . PMA_Util::sqlAddSlashes($password) . '\')');
-    $result = @PMA_DBI_try_query($local_query)
-            or PMA_Util::mysqlDie(
-                PMA_DBI_getError(), $sql_query, false, $err_url
-            );
+    if (! @PMA_DBI_try_query($local_query)) {
+        PMA_Util::mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url);
+    }
 }
 
 /**