diff --git a/net/raptorq/src/raptorqdec/imp.rs b/net/raptorq/src/raptorqdec/imp.rs
index 4d3496e3..01fd03f1 100644
--- a/net/raptorq/src/raptorqdec/imp.rs
+++ b/net/raptorq/src/raptorqdec/imp.rs
@@ -477,7 +477,7 @@ impl RaptorqDec {
         state
             .repair_packets
             .entry(this_seq)
-            .or_insert_with(Vec::new)
+            .or_default()
             .push(RepairPacketItem {
                 payload_id: id,
                 payload: payload[7..].to_vec(), // without PayloadId
diff --git a/net/webrtc/signalling/src/bin/server.rs b/net/webrtc/signalling/src/bin/server.rs
index e024e952..fe3c6925 100644
--- a/net/webrtc/signalling/src/bin/server.rs
+++ b/net/webrtc/signalling/src/bin/server.rs
@@ -53,7 +53,7 @@ fn initialize_logging(envvar_name: &str) -> Result<(), Error> {
 #[tokio::main]
 async fn main() -> Result<(), Error> {
     let args = Args::parse();
-    let server = Server::spawn(|stream| Handler::new(stream));
+    let server = Server::spawn(Handler::new);
 
     initialize_logging("WEBRTCSINK_SIGNALLING_SERVER_LOG")?;
 
diff --git a/net/webrtc/signalling/src/handlers/mod.rs b/net/webrtc/signalling/src/handlers/mod.rs
index 892b52fc..b287140e 100644
--- a/net/webrtc/signalling/src/handlers/mod.rs
+++ b/net/webrtc/signalling/src/handlers/mod.rs
@@ -292,11 +292,11 @@ impl Handler {
         );
         self.consumer_sessions
             .entry(consumer_id.to_string())
-            .or_insert_with(HashSet::new)
+            .or_default()
             .insert(session_id.clone());
         self.producer_sessions
             .entry(producer_id.to_string())
-            .or_insert_with(HashSet::new)
+            .or_default()
             .insert(session_id.clone());
         self.items.push_back((
             consumer_id.to_string(),