diff --git a/js/codemirror/lib/codemirror.js b/js/codemirror/lib/codemirror.js
index 8e9a34edc6..6be9bbd6e2 100644
--- a/js/codemirror/lib/codemirror.js
+++ b/js/codemirror/lib/codemirror.js
@@ -625,7 +625,8 @@ var CodeMirror = (function() {
       setSelection(selFrom, selTo, updateLine(sel.from.line), updateLine(sel.to.line));
 
       // Make sure the scroll-size div has the correct height.
-      code.style.height = (doc.height * textHeight() + 2 * paddingTop()) + "px";
+      if (scroller.clientHeight)
+        code.style.height = (doc.height * textHeight() + 2 * paddingTop()) + "px";
     }
 
     function replaceRange(code, from, to) {
diff --git a/js/server_status.js b/js/server_status.js
index c401ac83f8..b5132c002a 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -391,7 +391,7 @@ $(function() {
                 yaxis: {
                     autoscale:true,
                     label: PMA_messages['strTotalCount'],
-                    labelRenderer: $.jqplot.CanvasAxisLabelRenderer,
+                    labelRenderer: $.jqplot.CanvasAxisLabelRenderer
                 }
             },
             seriesDefaults: {
@@ -403,7 +403,7 @@ $(function() {
                 show: true,
                 location: 's',     // compass direction, nw, n, ne, e, se, s, sw, w.
                 xoffset: 12,        // pixel offset of the legend box from the x (or x2) axis.
-                yoffset: 12,        // pixel offset of the legend box from the y (or y2) axis.
+                yoffset: 12        // pixel offset of the legend box from the y (or y2) axis.
             }
         };