diff --git a/app/app.go b/app/app.go
index 54d9d22d0..72f8a61c4 100644
--- a/app/app.go
+++ b/app/app.go
@@ -196,9 +196,3 @@ func splitKey(key string) (prefix string, suffix string) {
 	}
 	return key, ""
 }
-
-// (not meant to be called)
-// assert that Basecoin implements `abci.Application` at compile-time
-func _assertABCIApplication(basecoin *Basecoin) abci.Application {
-	return basecoin
-}
diff --git a/cmd/commands/query.go b/cmd/commands/query.go
index 41635e288..ddcd5c433 100644
--- a/cmd/commands/query.go
+++ b/cmd/commands/query.go
@@ -92,13 +92,13 @@ func cmdQuery(c *cli.Context) error {
 
 	val := resp.Value
 	proof := resp.Proof
-	height := resp.Height
+	lastHeight := resp.LastHeight
 
 	fmt.Println(string(wire.JSONBytes(struct {
-		Value  []byte `json:"value"`
-		Proof  []byte `json:"proof"`
-		Height uint64 `json:"height"`
-	}{val, proof, height})))
+		Value      []byte `json:"value"`
+		Proof      []byte `json:"proof"`
+		LastHeight uint64 `json:"last_height"`
+	}{val, proof, lastHeight})))
 
 	return nil
 }
diff --git a/glide.lock b/glide.lock
index 90bae6db4..f87f437b8 100644
--- a/glide.lock
+++ b/glide.lock
@@ -2,11 +2,9 @@ hash: 3869944d14a8df914ffcad02c2ef3548173daba51c5ea697767f8af77c07b348
 updated: 2017-02-17T13:24:05.234809983+01:00
 imports:
 - name: github.com/btcsuite/btcd
-  version: afec1bd1245a4a19e6dfe1306974b733e7cbb9b8
+  version: d06c0bb181529331be8f8d9350288c420d9e60e4
   subpackages:
   - btcec
-- name: github.com/btcsuite/fastsha256
-  version: 637e656429416087660c84436a2a035d69d54e2e
 - name: github.com/BurntSushi/toml
   version: 99064174e013895bbd9b025c31100bd1d9b590ca
 - name: github.com/ebuchman/fail-test
@@ -156,14 +154,15 @@ imports:
   - transport
 testImports:
 - name: github.com/davecgh/go-spew
-  version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9
+  version: 346938d642f2ec3594ed81d874461961cd0faa76
   subpackages:
   - spew
 - name: github.com/pmezard/go-difflib
-  version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
+  version: 792786c7400a136282c1664665ae0a8db921c6c2
   subpackages:
   - difflib
 - name: github.com/stretchr/testify
   version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0
   subpackages:
   - assert
+  - require
diff --git a/glide.yaml b/glide.yaml
index ecf4f151b..570a80e24 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -13,9 +13,9 @@ import:
 - package: github.com/tendermint/go-wire
   version: develop
 - package: github.com/tendermint/merkleeyes
-  version: develop
+  version: last_height
 - package: github.com/tendermint/tendermint
-  version: develop
+  version: last_height
 - package: github.com/tendermint/abci
   version: develop
 - package: github.com/gorilla/websocket