diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index 8f3d7440b..bbfefb78d 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -1179,7 +1179,7 @@ impl ChainSync {
 		for (peer_id, peer_number) in updated_peers {
 			let mut peer_best = self.peers.get(&peer_id).unwrap().latest_hash.clone();
 			if best_number - peer_number > MAX_PEERS_PROPAGATION as BlockNumber {
-				// If we think peer is too far behind just end one latest hash
+				// If we think peer is too far behind just send one latest hash
 				peer_best = last_parent.clone();
 			}
 			sent = sent + match ChainSync::create_new_hashes_rlp(io.chain(), &peer_best, &local_best) {
diff --git a/util/src/network/host.rs b/util/src/network/host.rs
index 9560ca81e..fc4e07306 100644
--- a/util/src/network/host.rs
+++ b/util/src/network/host.rs
@@ -682,14 +682,13 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
 		let mut failure_id = None;
 		match token {
 			FIRST_HANDSHAKE ... LAST_HANDSHAKE => {
-				let mut handshakes = self.handshakes.write().unwrap();
+				let handshakes = self.handshakes.write().unwrap();
 				if let Some(handshake) = handshakes.get(token).cloned() {
 					failure_id = Some(handshake.lock().unwrap().id().clone());
-					handshakes.remove(token);
 				}
 			},
 			FIRST_SESSION ... LAST_SESSION => {
-				let mut sessions = self.sessions.write().unwrap();
+				let sessions = self.sessions.write().unwrap();
 				if let Some(session) = sessions.get(token).cloned() {
 					let s = session.lock().unwrap();
 					if s.is_ready() {
@@ -700,7 +699,6 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
 						}
 					}
 					failure_id = Some(s.id().clone());
-					sessions.remove(token);
 				}
 			},
 			_ => {},
diff --git a/util/src/network/session.rs b/util/src/network/session.rs
index 04fb6d930..572b91a18 100644
--- a/util/src/network/session.rs
+++ b/util/src/network/session.rs
@@ -91,7 +91,7 @@ impl Decodable for PeerCapabilityInfo {
 	}
 }
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug)]
 struct SessionCapabilityInfo {
 	pub protocol: &'static str,
 	pub version: u8,