diff --git a/consensus/reactor.go b/consensus/reactor.go
index 56cadcf9d..8d992bba7 100644
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@@ -225,8 +225,8 @@ func (conR *ConsensusReactor) SetPrivValidator(priv *sm.PrivValidator) {
 	conR.conS.SetPrivValidator(priv)
 }
 
-// Fast forward to some state.
-func (conR *ConsensusReactor) UpdateToState(state *sm.State) {
+// Reset to some state.
+func (conR *ConsensusReactor) ResetToState(state *sm.State) {
 	conR.conS.updateToState(state, false)
 }
 
diff --git a/p2p/switch.go b/p2p/switch.go
index 10da29f36..105561314 100644
--- a/p2p/switch.go
+++ b/p2p/switch.go
@@ -131,12 +131,12 @@ func (sw *Switch) AddPeerWithConnection(conn net.Conn, outbound bool) (*Peer, er
 		return nil, ErrSwitchDuplicatePeer
 	}
 
-	// Notify listeners.
-	sw.doAddPeer(peer)
-
 	// Start the peer
 	go peer.start()
 
+	// Notify listeners.
+	sw.doAddPeer(peer)
+
 	// Send handshake
 	msg := &pexHandshakeMessage{Network: sw.network}
 	peer.Send(PexChannel, msg)