diff --git a/pkg/services/alerting/conditions/reducer_test.go b/pkg/services/alerting/conditions/reducer_test.go
index 47a13a5a33d..7d6cee466fc 100644
--- a/pkg/services/alerting/conditions/reducer_test.go
+++ b/pkg/services/alerting/conditions/reducer_test.go
@@ -11,6 +11,7 @@ import (
 
 func TestSimpleReducer(t *testing.T) {
 	Convey("Test simple reducer by calculating", t, func() {
+
 		Convey("sum", func() {
 			result := testReducer("sum", 1, 2, 3)
 			So(result, ShouldEqual, float64(6))
diff --git a/public/app/features/dashboard/submenu/submenu.ts b/public/app/features/dashboard/submenu/submenu.ts
index 5e011b7588d..2ecb298236c 100644
--- a/public/app/features/dashboard/submenu/submenu.ts
+++ b/public/app/features/dashboard/submenu/submenu.ts
@@ -15,7 +15,6 @@ export class SubmenuCtrl {
               private $location) {
     this.annotations = this.dashboard.templating.list;
     this.variables = this.variableSrv.variables;
-    console.log(this.variables);
   }
 
   annotationStateChanged() {
diff --git a/public/app/plugins/panel/graph/axes_editor.ts b/public/app/plugins/panel/graph/axes_editor.ts
index 38083a80a56..b73ddf3868e 100644
--- a/public/app/plugins/panel/graph/axes_editor.ts
+++ b/public/app/plugins/panel/graph/axes_editor.ts
@@ -36,7 +36,7 @@ export class AxesEditorCtrl {
     this.xAxisStatOptions =  [
       {text: 'Avg', value: 'avg'},
       {text: 'Min', value: 'min'},
-      {text: 'Max', value: 'min'},
+      {text: 'Max', value: 'max'},
       {text: 'Total', value: 'total'},
       {text: 'Count', value: 'count'},
       {text: 'Current', value: 'current'},
diff --git a/public/app/plugins/panel/graph/data_processor.ts b/public/app/plugins/panel/graph/data_processor.ts
index 7718a2d6cd8..dcd202c5bee 100644
--- a/public/app/plugins/panel/graph/data_processor.ts
+++ b/public/app/plugins/panel/graph/data_processor.ts
@@ -163,7 +163,7 @@ export class DataProcessor {
         return [
           {text: 'Avg', value: 'avg'},
           {text: 'Min', value: 'min'},
-          {text: 'Max', value: 'min'},
+          {text: 'Max', value: 'max'},
           {text: 'Total', value: 'total'},
           {text: 'Count', value: 'count'},
         ];