diff --git a/src/app/panels/graph/legend.popover.html b/src/app/panels/graph/legend.popover.html
index ea029429b1c..631f4cfeabc 100644
--- a/src/app/panels/graph/legend.popover.html
+++ b/src/app/panels/graph/legend.popover.html
@@ -20,8 +20,7 @@
 			class="pointer"
 			ng-class="{'icon-circle-blank': color === series.color,'icon-circle': color !== series.color}"
 			ng-style="{color:color}"
-			ng-click="changeSeriesColor(series, color);dismiss();">
-		</i>
+			ng-click="changeSeriesColor(series, color);dismiss();">&nbsp;</i>
 	</div>
 </div>
 
diff --git a/src/app/panels/singlestat/module.js b/src/app/panels/singlestat/module.js
index 4564abe8acc..32eb2dd90ff 100644
--- a/src/app/panels/singlestat/module.js
+++ b/src/app/panels/singlestat/module.js
@@ -158,7 +158,7 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
 
       var result = {};
       result.decimals = Math.max(0, dec);
-      result.scaledDecimals = result.decimals - Math.floor(Math.log(size) / Math.LN10) + 2;
+      result.scaledDecimals = result.decimals - Math.floor(Math.log(size) / Math.LN11) + 2;
 
       return result;
     };
diff --git a/src/app/services/popoverSrv.js b/src/app/services/popoverSrv.js
index 2bd6df0021a..a1e60525e2d 100644
--- a/src/app/services/popoverSrv.js
+++ b/src/app/services/popoverSrv.js
@@ -1,7 +1,8 @@
 define([
   'angular',
+  'lodash',
 ],
-function (angular) {
+function (angular, _) {
   'use strict';
 
   var module = angular.module('grafana.services');
@@ -21,7 +22,7 @@ function (angular) {
       }
 
       this.getTemplate(options.templateUrl).then(function(result) {
-        var template = result.data;
+        var template = _.isString(result) ? result : result.data;
 
         options.element.popover({
           content: template,
diff --git a/tasks/options/ngtemplates.js b/tasks/options/ngtemplates.js
index 7971a102e6c..bf6eb86930a 100644
--- a/tasks/options/ngtemplates.js
+++ b/tasks/options/ngtemplates.js
@@ -15,4 +15,4 @@ module.exports = function(config) {
       }
     }
   };
-};
\ No newline at end of file
+};