diff --git a/panels/stats_table/module.js b/panels/stats_table/module.js
index 75c68c039192..1fec0ac93d2b 100644
--- a/panels/stats_table/module.js
+++ b/panels/stats_table/module.js
@@ -14,15 +14,16 @@ define([
     app.useModule(module);
 
     var y_format_metric_value = function (value, metric) {
+      // If this isn't a number, change nothing
+      if(!_.isNaN(value) || !_.isFinite(value)) {
+        return value;
+      }
       if (metric.y_format === 'bytes') {
         return kbn.byteFormat(value, metric.decimals);
       }
       if (metric.y_format === 'short') {
         return kbn.shortFormat(value, metric.decimals);
       }
-      if (typeof value !== 'number') {
-        return value;
-      }
       return value.toFixed(metric.decimals);
     };
 
@@ -168,7 +169,6 @@ define([
         if (_.isNumber(m.warning)) {
           m.warning = { threshold: m.warning, type: "upper_bound"};
         }
-
         return m;
       };
 
@@ -279,10 +279,10 @@ define([
               newRows.push({
                 display_name: display_name || persistent_name,
                 id: persistent_name,
-                selected: ($scope.rows[persistent_name] || {}).selected
+                // using findWhere here, though its not very efficient
+                selected: (_.findWhere($scope.rows,{id:persistent_name}) || {}).selected
               });
             });
-
             $scope.get_data(newRows);
           });
         });
diff --git a/tasks/default_task.js b/tasks/default_task.js
index e7b70d2c8546..0bca713ddfd6 100644
--- a/tasks/default_task.js
+++ b/tasks/default_task.js
@@ -1,3 +1,3 @@
 module.exports = function(grunt) {
-  grunt.registerTask('default', []);
+  grunt.registerTask('default', ['jshint']);
 };
\ No newline at end of file