diff --git a/README.md b/README.md
index 952c22c..fcce144 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Ancient interfaces are used for Ancient/frozen data operations (e.g. rawdb/table
 Outside of these primarily auxiliary capabilities, this package satisfies the interfaces required for many state operations using Ethereum data on IPFS.
 
 e.g.
- 
+
 go-ethereum trie.NodeIterator and state.NodeIterator can be constructed from the ethdb.KeyValueStore and ethdb.Database interfaces, respectively:
 
 ```go
@@ -42,7 +42,7 @@ package main
 
 import (
     "context"
-	
+
     "github.com/ethereum/go-ethereum/common"
     "github.com/ethereum/go-ethereum/core/state"
     "github.com/ethereum/go-ethereum/trie"
@@ -50,7 +50,7 @@ import (
     "github.com/ipfs/go-ipfs/core"
     "github.com/ipfs/go-ipfs/repo/fsrepo"
     "github.com/jmoiron/sqlx"
-    "github.com/vulcanize/ipfs-ethdb"
+    "github.com/vulcanize/ipfs-ethdb/v4"
 )
 
 func main() {
diff --git a/batch_test.go b/batch_test.go
index 259fc46..7f296dc 100644
--- a/batch_test.go
+++ b/batch_test.go
@@ -25,7 +25,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	ipfsethdb "github.com/vulcanize/ipfs-ethdb/v3"
+	ipfsethdb "github.com/vulcanize/ipfs-ethdb/v4"
 )
 
 var (
diff --git a/database_test.go b/database_test.go
index b3b8518..28c340f 100644
--- a/database_test.go
+++ b/database_test.go
@@ -26,7 +26,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	ipfsethdb "github.com/vulcanize/ipfs-ethdb/v3"
+	ipfsethdb "github.com/vulcanize/ipfs-ethdb/v4"
 )
 
 var (
diff --git a/go.mod b/go.mod
index 00843b0..1b97146 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/vulcanize/ipfs-ethdb/v3
+module github.com/vulcanize/ipfs-ethdb/v4
 
 go 1.15
 
diff --git a/postgres/batch_test.go b/postgres/batch_test.go
index ddb8328..e5ede9e 100644
--- a/postgres/batch_test.go
+++ b/postgres/batch_test.go
@@ -27,7 +27,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	pgipfsethdb "github.com/vulcanize/ipfs-ethdb/v3/postgres"
+	pgipfsethdb "github.com/vulcanize/ipfs-ethdb/v4/postgres"
 )
 
 var (
diff --git a/postgres/database.go b/postgres/database.go
index e408c32..321337f 100644
--- a/postgres/database.go
+++ b/postgres/database.go
@@ -33,7 +33,7 @@ import (
 var errNotSupported = errors.New("this operation is not supported")
 
 var (
-	hasPgStr    = "SELECT exists(select 1 from public.blocks WHERE key = $1)"
+	hasPgStr    = "SELECT exists(select 1 from public.blocks WHERE key = $1 LIMIT 1)"
 	getPgStr    = "SELECT data FROM public.blocks WHERE key = $1 LIMIT 1"
 	putPgStr    = "INSERT INTO public.blocks (key, data, block_number) VALUES ($1, $2, $3) ON CONFLICT DO NOTHING"
 	deletePgStr = "DELETE FROM public.blocks WHERE key = $1"
@@ -254,7 +254,7 @@ func (d *Database) NewBatch() ethdb.Batch {
 // NewBatchWithSize satisfies the ethdb.Batcher interface.
 // NewBatchWithSize creates a write-only database batch with pre-allocated buffer.
 func (d *Database) NewBatchWithSize(size int) ethdb.Batch {
-	return NewBatch(d.db, nil)
+	return NewBatch(d.db, nil, d.BlockNumber)
 }
 
 // NewIterator satisfies the ethdb.Iteratee interface
diff --git a/postgres/database_test.go b/postgres/database_test.go
index 2a9751d..a1d9b2b 100644
--- a/postgres/database_test.go
+++ b/postgres/database_test.go
@@ -28,7 +28,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	pgipfsethdb "github.com/vulcanize/ipfs-ethdb/v3/postgres"
+	pgipfsethdb "github.com/vulcanize/ipfs-ethdb/v4/postgres"
 )
 
 var (
diff --git a/postgres/doc.md b/postgres/doc.md
index cf68683..a9c6d9d 100644
--- a/postgres/doc.md
+++ b/postgres/doc.md
@@ -18,7 +18,7 @@ import (
     "github.com/ethereum/go-ethereum/core/state"
     "github.com/ethereum/go-ethereum/trie"
     "github.com/jmoiron/sqlx"
-    "github.com/vulcanize/ipfs-ethdb/v3/postgres"
+    "github.com/vulcanize/ipfs-ethdb/v4/postgres"
 )
 
 func main() {