diff --git a/Makefile b/Makefile
index ca23c63f4..a0312213c 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ TEST_ARTIFACTS = prometheus search_index
 
 include Makefile.INCLUDE
 
-all: test
+all: binary test
 
 advice:
 	go tool vet .
diff --git a/main.go b/main.go
index ec18a7aa5..bd95b8eca 100644
--- a/main.go
+++ b/main.go
@@ -19,7 +19,6 @@ import (
 	"github.com/prometheus/prometheus/retrieval"
 	"github.com/prometheus/prometheus/retrieval/format"
 	"github.com/prometheus/prometheus/rules"
-	"github.com/prometheus/prometheus/rules/ast"
 	"github.com/prometheus/prometheus/storage/metric"
 	"github.com/prometheus/prometheus/web"
 	"github.com/prometheus/prometheus/web/api"
diff --git a/web/status.go b/web/status.go
index 828837a65..7b5a5f9f4 100644
--- a/web/status.go
+++ b/web/status.go
@@ -32,12 +32,12 @@ type PrometheusStatus struct {
 }
 
 type StatusHandler struct {
+	sync.Mutex
 	BuildInfo        map[string]string
 	Config           *config.Config
 	CurationState    chan metric.CurationState
 	PrometheusStatus *PrometheusStatus
 	TargetManager    retrieval.TargetManager
-	mutex            sync.Mutex
 }
 
 func (h *StatusHandler) ServeRequestsForever() {