diff --git a/core/chain_manager_test.go b/core/chain_manager_test.go
index 2ed3c6c9e..6c66961b0 100644
--- a/core/chain_manager_test.go
+++ b/core/chain_manager_test.go
@@ -71,7 +71,7 @@ func TestChainInsertions(t *testing.T) {
 	var eventMux event.TypeMux
 	chainMan := NewChainManager(&eventMux)
 	txPool := NewTxPool(&eventMux)
-	blockMan := NewBlockManager(txPool, chainMan, &eventMux)
+	blockMan := NewBlockProcessor(txPool, chainMan, &eventMux)
 	chainMan.SetProcessor(blockMan)
 
 	const max = 2
@@ -115,7 +115,7 @@ func TestChainMultipleInsertions(t *testing.T) {
 	var eventMux event.TypeMux
 	chainMan := NewChainManager(&eventMux)
 	txPool := NewTxPool(&eventMux)
-	blockMan := NewBlockManager(txPool, chainMan, &eventMux)
+	blockMan := NewBlockProcessor(txPool, chainMan, &eventMux)
 	chainMan.SetProcessor(blockMan)
 	done := make(chan bool, max)
 	for i, chain := range chains {
diff --git a/core/transaction_pool_test.go b/core/transaction_pool_test.go
index e77d7a1ae..2e1debfbe 100644
--- a/core/transaction_pool_test.go
+++ b/core/transaction_pool_test.go
@@ -55,7 +55,7 @@ func TestAddInvalidTx(t *testing.T) {
 func TestRemoveSet(t *testing.T) {
 	pool, _ := setup()
 	tx1 := transaction()
-	pool.pool.Add(tx1)
+	pool.addTx(tx1)
 	pool.RemoveSet(types.Transactions{tx1})
 	if pool.Size() > 0 {
 		t.Error("expected pool size to be 0")
@@ -65,7 +65,7 @@ func TestRemoveSet(t *testing.T) {
 func TestRemoveInvalid(t *testing.T) {
 	pool, key := setup()
 	tx1 := transaction()
-	pool.pool.Add(tx1)
+	pool.addTx(tx1)
 	pool.RemoveInvalid(stateQuery{})
 	if pool.Size() > 0 {
 		t.Error("expected pool size to be 0")
@@ -73,7 +73,7 @@ func TestRemoveInvalid(t *testing.T) {
 
 	tx1.SetNonce(1)
 	tx1.SignECDSA(key)
-	pool.pool.Add(tx1)
+	pool.addTx(tx1)
 	pool.RemoveInvalid(stateQuery{})
 	if pool.Size() != 1 {
 		t.Error("expected pool size to be 1, is", pool.Size())
diff --git a/xeth/js_types.go b/xeth/js_types.go
index dbddcb7a3..e7a1e95e9 100644
--- a/xeth/js_types.go
+++ b/xeth/js_types.go
@@ -169,8 +169,8 @@ func NewJSPeer(peer *p2p.Peer) *JSPeer {
 
 	return &JSPeer{
 		ref:     peer,
-		Ip:      peer.RemoteAddr().String(),
-		Version: peer.Identity().String(),
+		Ip:      fmt.Sprintf("%v", peer.RemoteAddr()),
+		Version: fmt.Sprintf("%v", peer.Identity()),
 		Caps:    fmt.Sprintf("%v", caps),
 	}
 }