diff --git a/Makefile b/Makefile
index 2ce4704..61a2c6f 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,8 @@ $(MOCKS_DIR)/gen_backend.go:
 		github.com/openrelayxyz/plugeth-utils/core Backend,Downloader
 
 docker-image: mocks
-	docker build . -t "cerc/plugeth-statediff:local"
+	docker build . -t "cerc/plugeth-statediff:local" \
+		--build-arg GIT_VDBTO_TOKEN=$(GIT_VDBTO_TOKEN)
 .PHONY: docker-image
 
 # Local build
diff --git a/scripts/integration-setup.sh b/scripts/integration-setup.sh
index 29c41ab..06044ce 100755
--- a/scripts/integration-setup.sh
+++ b/scripts/integration-setup.sh
@@ -7,7 +7,7 @@ laconic_so="${LACONIC_SO:-laconic-so} --stack fixturenet-plugeth-tx --verbose"
 
 CONFIG_DIR=$(readlink -f "${CONFIG_DIR:-$(mktemp -d)}")
 
-# By default assume we are running in the project root
+# Point stack-orchestrator to the multi-project root
 export CERC_REPO_BASE_DIR="${CERC_REPO_BASE_DIR:-$(realpath $(git rev-parse --show-toplevel)/..)}"
 
 # v5 migrations only go up to version 18
diff --git a/utils/iterator_test.go b/utils/iterator_test.go
index 3a97939..c581f91 100644
--- a/utils/iterator_test.go
+++ b/utils/iterator_test.go
@@ -63,18 +63,16 @@ func TestSymmetricDifferenceIterator(t *testing.T) {
 			triea.NodeIterator([]byte("jars")),
 			trieb.NodeIterator(nil))
 		for di.Next(true) {
-			t.Errorf("iterator should not yield any elements")
-			t.Logf("%s", di.LeafKey())
+			t.Errorf("iterator should not yield any elements, but got key %s", di.Path())
 		}
 		assert.Equal(t, 0, *count)
 
-		// TODO will fail until merged: https://github.com/ethereum/go-ethereum/pull/27838
+		// // TODO will fail until merged: https://github.com/ethereum/go-ethereum/pull/27838
 		// di, count = utils.NewSymmetricDifferenceIterator(
 		// 	triea.NodeIterator([]byte("food")),
 		// 	trieb.NodeIterator(nil))
 		// for di.Next(true) {
-		// 	t.Errorf("iterator should not yield any elements")
-		// 	t.Logf("%s", di.LeafKey())
+		// 	t.Errorf("iterator should not yield any elements, but got key %s", di.Path())
 		// }
 		// assert.Equal(t, 0, *count)
 	})