diff --git a/crates/librqbit/src/tests/e2e.rs b/crates/librqbit/src/tests/e2e.rs
index 3370ecd..abb598f 100644
--- a/crates/librqbit/src/tests/e2e.rs
+++ b/crates/librqbit/src/tests/e2e.rs
@@ -73,6 +73,7 @@ async fn test_e2e_download() {
                         enable_upnp_port_forwarding: false,
                         default_storage_factory: None,
                         defer_writes_up_to: None,
+                        root_span: Some(error_span!(parent: None, "server", id = i)),
                         ..Default::default()
                     },
                 )
@@ -121,7 +122,7 @@ async fn test_e2e_download() {
                     session.tcp_listen_port().unwrap(),
                 ))
             }
-            .instrument(error_span!("server", server = i)),
+            .instrument(error_span!("server", id = i)),
         );
         futs.push(timeout(Duration::from_secs(30), rx));
     }
@@ -152,6 +153,7 @@ async fn test_e2e_download() {
                 persistence: None,
                 listen_port_range: None,
                 enable_upnp_port_forwarding: false,
+                root_span: Some(error_span!("client")),
                 ..Default::default()
             },
         )
diff --git a/crates/peer_binary_protocol/src/extended/handshake.rs b/crates/peer_binary_protocol/src/extended/handshake.rs
index e3cd460..2a438bc 100644
--- a/crates/peer_binary_protocol/src/extended/handshake.rs
+++ b/crates/peer_binary_protocol/src/extended/handshake.rs
@@ -52,7 +52,7 @@ where
     ByteBuf: Eq + std::hash::Hash + std::borrow::Borrow<[u8]>,
 {
     fn get_msgid(&self, msg_type: &'a [u8]) -> Option<u8> {
-        self.m.get(msg_type).map(|v| *v)
+        self.m.get(msg_type).copied()
     }
 
     pub fn ut_metadata(&self) -> Option<u8> {