diff --git a/substrate/client/network/src/service.rs b/substrate/client/network/src/service.rs
index d36e3107958183fd653b9e8670a276f9e3fbbdde..162b9c6a3049180266dd43c1e7a26e7209399c36 100644
--- a/substrate/client/network/src/service.rs
+++ b/substrate/client/network/src/service.rs
@@ -160,18 +160,7 @@ where
 			.network_config
 			.boot_nodes
 			.into_iter()
-			.filter(|boot_node| {
-				if boot_node.peer_id == local_peer_id {
-					warn!(
-						target: "sub-libp2p",
-						"Local peer ID used in bootnode, ignoring: {}",
-						boot_node,
-					);
-					false
-				} else {
-					true
-				}
-			})
+			.filter(|boot_node| boot_node.peer_id != local_peer_id)
 			.collect();
 		params.network_config.default_peers_set.reserved_nodes = params
 			.network_config
@@ -1825,7 +1814,7 @@ where
 								if let ConnectedPoint::Dialer { address, role_override: _ } =
 									endpoint
 								{
-									error!(
+									warn!(
 										"💔 The bootnode you want to connect to at `{}` provided a different peer ID `{}` than the one you expect `{}`.",
 										address,
 										obtained,
diff --git a/substrate/primitives/trie/src/cache/mod.rs b/substrate/primitives/trie/src/cache/mod.rs
index a588f20bdb7b4aa253c178f31484e81cd42dd59e..67348919250cd12395be0174d59c44786accc3b4 100644
--- a/substrate/primitives/trie/src/cache/mod.rs
+++ b/substrate/primitives/trie/src/cache/mod.rs
@@ -631,7 +631,7 @@ mod tests {
 			let mut cache = local_cache.as_trie_db_cache(root);
 			let trie = TrieDBBuilder::<Layout>::new(&db, &root).with_cache(&mut cache).build();
 
-			for (k, _) in TEST_DATA.iter().take(2) {
+			for (k, _) in TEST_DATA.iter().skip(2) {
 				trie.get(k).unwrap().unwrap();
 			}
 		}