diff --git a/core/blockchain_test.go b/core/blockchain_test.go
index 6ee89b6f34..92060a8e4a 100644
--- a/core/blockchain_test.go
+++ b/core/blockchain_test.go
@@ -2474,7 +2474,7 @@ func TestSideImportPrunedBlocks(t *testing.T) {
 	blocks, _ := GenerateChain(params.TestChainConfig, genesis, engine, db, 2*TriesInMemory, nil)
 	diskdb := rawdb.NewMemoryDatabase()
 	new(Genesis).MustCommit(diskdb)
-	chain, err := NewBlockChain(diskdb, nil, params.TestChainConfig, engine, vm.Config{}, nil)
+	chain, err := NewBlockChain(diskdb, nil, params.TestChainConfig, engine, vm.Config{}, nil, nil)
 	if err != nil {
 		t.Fatalf("failed to create tester chain: %v", err)
 	}
@@ -2568,7 +2568,7 @@ func TestDeleteCreateRevert(t *testing.T) {
 	diskdb := rawdb.NewMemoryDatabase()
 	gspec.MustCommit(diskdb)
 
-	chain, err := NewBlockChain(diskdb, nil, params.TestChainConfig, engine, vm.Config{}, nil)
+	chain, err := NewBlockChain(diskdb, nil, params.TestChainConfig, engine, vm.Config{}, nil, nil)
 	if err != nil {
 		t.Fatalf("failed to create tester chain: %v", err)
 	}
diff --git a/core/rawdb/chain_iterator.go b/core/rawdb/chain_iterator.go
index 96ead329d8..7dfe69d70f 100644
--- a/core/rawdb/chain_iterator.go
+++ b/core/rawdb/chain_iterator.go
@@ -213,7 +213,7 @@ func UnindexTransactions(db ethdb.Database, from uint64, to uint64) {
 	// will be left in the database if crash happens but it's fine.
 	WriteTxIndexTail(db, to)
 
-	// If only one block is unindexed, do it direclty
+	// If only one block is unindexed, do it directly
 	if from+1 == to {
 		DeleteTxLookupEntries(db, ReadBlock(db, ReadCanonicalHash(db, from), from))
 		log.Info("Unindexed transactions", "blocks", 1, "tail", to)
diff --git a/eth/handler_test.go b/eth/handler_test.go
index 6c1c88b1bf..e383f36c1d 100644
--- a/eth/handler_test.go
+++ b/eth/handler_test.go
@@ -639,7 +639,7 @@ func TestBroadcastMalformedBlock(t *testing.T) {
 		gspec   = &core.Genesis{Config: config}
 		genesis = gspec.MustCommit(db)
 	)
-	blockchain, err := core.NewBlockChain(db, nil, config, engine, vm.Config{}, nil)
+	blockchain, err := core.NewBlockChain(db, nil, config, engine, vm.Config{}, nil, nil)
 	if err != nil {
 		t.Fatalf("failed to create new blockchain: %v", err)
 	}
diff --git a/eth/protocol_test.go b/eth/protocol_test.go
index a313e4e6cf..fc916a2263 100644
--- a/eth/protocol_test.go
+++ b/eth/protocol_test.go
@@ -175,8 +175,8 @@ func TestForkIDSplit(t *testing.T) {
 		genesisNoFork  = gspecNoFork.MustCommit(dbNoFork)
 		genesisProFork = gspecProFork.MustCommit(dbProFork)
 
-		chainNoFork, _  = core.NewBlockChain(dbNoFork, nil, configNoFork, engine, vm.Config{}, nil)
-		chainProFork, _ = core.NewBlockChain(dbProFork, nil, configProFork, engine, vm.Config{}, nil)
+		chainNoFork, _  = core.NewBlockChain(dbNoFork, nil, configNoFork, engine, vm.Config{}, nil, nil)
+		chainProFork, _ = core.NewBlockChain(dbProFork, nil, configProFork, engine, vm.Config{}, nil, nil)
 
 		blocksNoFork, _  = core.GenerateChain(configNoFork, genesisNoFork, engine, dbNoFork, 2, nil)
 		blocksProFork, _ = core.GenerateChain(configProFork, genesisProFork, engine, dbProFork, 2, nil)