diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index dd96e29e22..7a3a436e28 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -3969,10 +3969,8 @@ class PMA_DisplayResults
 
         } elseif (((substr($meta->type, 0, 9) == self::TIMESTAMP_FIELD)
             || ($meta->type == self::DATETIME_FIELD)
-            || ($meta->type == self::TIME_FIELD)
             || ($meta->type == self::TIME_FIELD))
-            // micro seconds delimiter
-            && (/*overload*/mb_strpos($column, ".") !== false)
+            && (/*overload*/mb_strpos($column, ".") !== false) // micro seconds delimiter
         ) {
             $column = PMA_Util::addMicroseconds($column);
         }
diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php
index 0bf172dadd..98ee527e57 100644
--- a/libraries/server_status_variables.lib.php
+++ b/libraries/server_status_variables.lib.php
@@ -253,7 +253,7 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
                 $retval .= '<span class="allfine">';
             }
         }
-        if (substr($name, -1)) {
+        if (substr($name, -1) === '%') {
             $retval .= htmlspecialchars(PMA_Util::formatNumber($value, 0, 2)) . ' %';
         } elseif (strpos($name, 'Uptime') !== false) {
             $retval .= htmlspecialchars(