diff --git a/pkg/distributor/http.go b/pkg/distributor/http.go
index a2c76daacd..8c16295294 100644
--- a/pkg/distributor/http.go
+++ b/pkg/distributor/http.go
@@ -10,7 +10,7 @@ import (
 
 func (d *Distributor) PushHandler(w http.ResponseWriter, r *http.Request) {
 	var req logproto.PushRequest
-	if _, err := util.ParseProtoRequest(r.Context(), r, &req, util.RawSnappy); err != nil {
+	if _, err := util.ParseProtoReader(r.Context(), r.Body, &req, util.RawSnappy); err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
diff --git a/pkg/logproto/dep.go b/pkg/logproto/dep.go
index 6c90a3857f..c94de05ac7 100644
--- a/pkg/logproto/dep.go
+++ b/pkg/logproto/dep.go
@@ -3,4 +3,5 @@ package logproto
 import (
 	// trick dep into including this, needed by the generated code.
 	_ "github.com/gogo/protobuf/types"
+	_ "github.com/weaveworks/cortex/pkg/util/wire"
 )
diff --git a/pkg/querier/http.go b/pkg/querier/http.go
index 46a5ed4ede..9ec81847af 100644
--- a/pkg/querier/http.go
+++ b/pkg/querier/http.go
@@ -15,9 +15,9 @@ const (
 
 func (q *Querier) QueryHandler(w http.ResponseWriter, r *http.Request) {
 	query := r.FormValue("query")
-	limitStr := r.FormValue("limit")
+
 	limit := defaultQueryLimit
-	if limitStr != "" {
+	if limitStr := r.FormValue("limit"); limitStr != "" {
 		var err error
 		limit, err = strconv.Atoi(limitStr)
 		if err != nil {