diff --git a/Gopkg.lock b/Gopkg.lock
index e5baf1e4aa8e29ede358ccb68dc7c6e60f0c5dbd..30aac009bff7ad6ee8e95f5eaca65486dd86aeb1 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -532,6 +532,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "5427bb653536a3dcbc91e70991f2a1d9577d9198204fa84c73adc854d93cdf0a"
+  inputs-digest = "ef2abf85870ab16c7ec56ad383638fe151996472e942921b51e6190a1f454013"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 2f689175faf605949d7a71c0a815d495b4384b3d..34827290fc3d655bd8ee4f2aff044fbc97108ea0 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -26,7 +26,7 @@
 
 [[constraint]]
   name = "github.com/tendermint/iavl"
-  branch = "develop"
+  version = "=0.8.0-rc0"
 
 [[constraint]]
   name = "github.com/prometheus/client_golang"
diff --git a/Makefile b/Makefile
index 0a61ec9dc61f786cd4d9c1fbf1f86d4ca22d6a1b..bf0faf067363dd560377595746510bfeeafbfe74 100644
--- a/Makefile
+++ b/Makefile
@@ -72,12 +72,6 @@ protobuf_deps:
 %.pb.go: %.proto
 	protoc -I ${GOPATH}/src ${REPO}/$< --go_out=plugins=grpc:${GOPATH}/src
 
-keys/pbkeys/keys.pb.go: keys/pbkeys/keys.proto
-
-rpc/burrow/burrow.pb.go: rpc/burrow/burrow.proto
-
-execution/events/events.pb.go: execution/events/events.proto
-
 .PHONY: protobuf
 protobuf: $(PROTO_GO_FILES)
 
@@ -126,7 +120,7 @@ build_race:	check build_race_db build_race_client
 
 # build burrow
 .PHONY: build_db
-build_db: commit_hash
+build_db: commit_hash protobuf
 	go build -ldflags "-extldflags '-static' \
 	-X github.com/hyperledger/burrow/project.commit=$(shell cat commit_hash.txt)" \
 	-o ${REPO}/bin/burrow ./cmd/burrow
@@ -137,7 +131,7 @@ install_db: build_db
 
 # build burrow-client
 .PHONY: build_client
-build_client: commit_hash
+build_client: commit_hash protobuf
 	go build -ldflags "-extldflags '-static' \
 	-X github.com/hyperledger/burrow/project.commit=$(shell cat commit_hash.txt)" \
 	-o ${REPO}/bin/burrow-client ./client/cmd/burrow-client