diff --git a/chain/helper_test.go b/chain/helper_test.go
index 459e3e63ab4cbc18efe002dae6f8e40ce5393c06..8c7532111a6cc0185631ac77fc2153f0f7a299aa 100644
--- a/chain/helper_test.go
+++ b/chain/helper_test.go
@@ -4,6 +4,7 @@ import (
 	"container/list"
 	"fmt"
 
+	"github.com/ethereum/go-ethereum/chain/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/ethutil"
@@ -19,7 +20,7 @@ type TestManager struct {
 	db         ethutil.Database
 	txPool     *TxPool
 	blockChain *ChainManager
-	Blocks     []*Block
+	Blocks     []*types.Block
 }
 
 func (s *TestManager) IsListening() bool {
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
index c894a8f8569a6b5788bbd81036ecca1eef9c1aa7..aa933c4e7a41d76902be191a0343cbca275c5642 100644
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@@ -21,8 +21,7 @@ import (
 	"fmt"
 	"os"
 	"runtime"
-
-	"github.com/ethereum/go-ethereum/chain"
+	"github.com/ethereum/go-ethereum/chain/types"
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/ethutil"
 	"github.com/ethereum/go-ethereum/logger"
@@ -74,7 +73,7 @@ func main() {
 	ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer)
 
 	if Dump {
-		var block *chain.Block
+		var block *types.Block
 
 		if len(DumpHash) == 0 && DumpNumber == -1 {
 			block = ethereum.ChainManager().CurrentBlock
diff --git a/ptrie/trie_test.go b/ptrie/trie_test.go
index 8b98f4408c19738684087a8972c4a8772144e7bd..6cdd2bde49adbda8d5fba095a07c5b487e9077e9 100644
--- a/ptrie/trie_test.go
+++ b/ptrie/trie_test.go
@@ -132,7 +132,7 @@ func BenchmarkUpdate(b *testing.B) {
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		trie.UpdateString(fmt.Sprintf("aaaaaaaaa%d", base, i), "value")
+		trie.UpdateString(fmt.Sprintf("aaaaaaaaa%d", i), "value")
 	}
 	trie.Hash()
 }
diff --git a/trie/trie_test.go b/trie/trie_test.go
index 25eb1742f7501ca37671e1dd29c06aebfa8a292e..207d41f30d2e344ee216f3644a2c46eb2beb2884 100644
--- a/trie/trie_test.go
+++ b/trie/trie_test.go
@@ -1,12 +1,14 @@
 package trie
 
 import (
+	"bytes"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"math/rand"
 	"net/http"
+	"testing"
 	"time"
 
 	checker "gopkg.in/check.v1"