diff --git a/Gopkg.lock b/Gopkg.lock
index ed0469fc0..a8071c915 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -199,6 +199,12 @@
   revision = "bfe3c2e8f406bf352bc8df81f98c752224867349"
   version = "v2.17.11"
 
+[[projects]]
+  branch = "master"
+  name = "github.com/shirou/w32"
+  packages = ["."]
+  revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"
+
 [[projects]]
   name = "github.com/sony/gobreaker"
   packages = ["."]
@@ -274,6 +280,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "53ae0cdcbfa8419b233a0544d7ebb80614af3dd04bebdc0c8f2d3620a87efa91"
+  inputs-digest = "668c03e22d947dd7e24c4c5e07d7850ed0a2ea9a27d2af1fa0d1cff0e3743b0b"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/handler_test.go b/handler_test.go
index 04903c979..585230b15 100644
--- a/handler_test.go
+++ b/handler_test.go
@@ -357,7 +357,7 @@ func TestHandler_Query_Uint64_Protobuf(t *testing.T) {
 	if err := proto.Unmarshal(w.Body.Bytes(), &resp); err != nil {
 		t.Fatal(err)
 	} else if rt := resp.Results[0].Type; rt != pilosa.QueryResultTypeUint64 {
-		t.Fatalf("unexpected response type: %s", resp.Results[0].Type)
+		t.Fatalf("unexpected response type: %d", resp.Results[0].Type)
 	} else if n := resp.Results[0].N; n != 100 {
 		t.Fatalf("unexpected n: %d", n)
 	}
@@ -445,7 +445,7 @@ func TestHandler_Query_Bitmap_Protobuf(t *testing.T) {
 	if err := proto.Unmarshal(w.Body.Bytes(), &resp); err != nil {
 		t.Fatal(err)
 	} else if rt := resp.Results[0].Type; rt != pilosa.QueryResultTypeBitmap {
-		t.Fatalf("unexpected response type: %s", resp.Results[0].Type)
+		t.Fatalf("unexpected response type: %d", resp.Results[0].Type)
 	} else if bits := resp.Results[0].Bitmap.Bits; !reflect.DeepEqual(bits, []uint64{1, SliceWidth + 1}) {
 		t.Fatalf("unexpected bits: %+v", bits)
 	} else if attrs := resp.Results[0].Bitmap.Attrs; len(attrs) != 3 {
@@ -506,7 +506,7 @@ func TestHandler_Query_Bitmap_ColumnAttrs_Protobuf(t *testing.T) {
 	if bits := resp.Results[0].Bitmap.Bits; !reflect.DeepEqual(bits, []uint64{1, SliceWidth + 1}) {
 		t.Fatalf("unexpected bits: %+v", bits)
 	} else if rt := resp.Results[0].Type; rt != pilosa.QueryResultTypeBitmap {
-		t.Fatalf("unexpected response type: %s", resp.Results[0].Type)
+		t.Fatalf("unexpected response type: %d", resp.Results[0].Type)
 	} else if attrs := resp.Results[0].Bitmap.Attrs; len(attrs) != 3 {
 		t.Fatalf("unexpected attr length: %d", len(attrs))
 	} else if k, v := attrs[0].Key, attrs[0].StringValue; k != "a" || v != "b" {
@@ -579,7 +579,7 @@ func TestHandler_Query_Pairs_Protobuf(t *testing.T) {
 	if err := proto.Unmarshal(w.Body.Bytes(), &resp); err != nil {
 		t.Fatal(err)
 	} else if rt := resp.Results[0].Type; rt != pilosa.QueryResultTypePairs {
-		t.Fatalf("unexpected response type: %s", resp.Results[0].Type)
+		t.Fatalf("unexpected response type: %d", resp.Results[0].Type)
 	} else if a := resp.Results[0].GetPairs(); len(a) != 2 {
 		t.Fatalf("unexpected pair length: %d", len(a))
 	}
diff --git a/server.go b/server.go
index c8e536c50..83d417abd 100644
--- a/server.go
+++ b/server.go
@@ -15,6 +15,7 @@
 package pilosa
 
 import (
+	"context"
 	"crypto/tls"
 	"errors"
 	"fmt"
@@ -35,7 +36,6 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/pilosa/pilosa/diagnostics"
 	"github.com/pilosa/pilosa/internal"
-	"golang.org/x/net/context"
 	"golang.org/x/sync/errgroup"
 )