diff --git a/blocksync/reactor.go b/blocksync/reactor.go
index e0357d567..63e1fc56e 100644
--- a/blocksync/reactor.go
+++ b/blocksync/reactor.go
@@ -227,7 +227,7 @@ func (bcR *Reactor) Receive(e p2p.Envelope) {
 		extCommit, err := types.ExtendedCommitFromProto(msg.ExtCommit)
 		if err != nil {
 			bcR.Logger.Error("failed to convert extended commit from proto",
-				"peer", src,
+				"peer", e.Src,
 				"err", err)
 			return
 		}
diff --git a/consensus/replay_test.go b/consensus/replay_test.go
index 49f77f251..a51e39f67 100644
--- a/consensus/replay_test.go
+++ b/consensus/replay_test.go
@@ -312,7 +312,7 @@ const numBlocks = 6
 var modes = []uint{0, 1, 2, 3}
 
 // This is actually not a test, it's for storing validator change tx data for testHandshakeReplay
-func setupChainWithChangingValidators(t *testing.T, name string, nBlocks int) (*cfg.Config, []*types.Block, []*types.Commit, sm.State) {
+func setupChainWithChangingValidators(t *testing.T, name string, nBlocks int) (*cfg.Config, []*types.Block, []*types.ExtendedCommit, sm.State) {
 	nPeers := 7
 	nVals := 4
 	css, genDoc, config, cleanup := randConsensusNetWithPeers(
@@ -543,7 +543,7 @@ func setupChainWithChangingValidators(t *testing.T, name string, nBlocks int) (*
 		chain = append(chain, css[0].blockStore.LoadBlock(int64(i)))
 		extCommits = append(extCommits, css[0].blockStore.LoadBlockExtendedCommit(int64(i)))
 	}
-	return config, chain, commits, genesisState
+	return config, chain, extCommits, genesisState
 }
 
 // Sync from scratch