diff --git a/src/imex/transfer.rs b/src/imex/transfer.rs
index 4d939b75c..e3433e398 100644
--- a/src/imex/transfer.rs
+++ b/src/imex/transfer.rs
@@ -103,7 +103,7 @@ impl BackupProvider {
         let context_dir = context
             .get_blobdir()
             .parent()
-            .ok_or(anyhow!("Context dir not found"))?;
+            .ok_or_else(|| anyhow!("Context dir not found"))?;
         let dbfile = context_dir.join(DBFILE_BACKUP_NAME);
         if fs::metadata(&dbfile).await.is_ok() {
             fs::remove_file(&dbfile).await?;
@@ -497,7 +497,7 @@ async fn on_blob(
         let context_dir = context
             .get_blobdir()
             .parent()
-            .ok_or(anyhow!("Context dir not found"))?;
+            .ok_or_else(|| anyhow!("Context dir not found"))?;
         let dbfile = context_dir.join(DBFILE_BACKUP_NAME);
         if fs::metadata(&dbfile).await.is_ok() {
             fs::remove_file(&dbfile).await?;
diff --git a/src/qr.rs b/src/qr.rs
index f40b3786e..d13366860 100644
--- a/src/qr.rs
+++ b/src/qr.rs
@@ -500,7 +500,7 @@ fn decode_webrtc_instance(_context: &Context, qr: &str) -> Result<Qr> {
 fn decode_backup(qr: &str) -> Result<Qr> {
     let payload = qr
         .strip_prefix(DCBACKUP_SCHEME)
-        .ok_or(anyhow!("invalid DCBACKUP scheme"))?;
+        .ok_or_else(|| anyhow!("invalid DCBACKUP scheme"))?;
     let ticket: iroh::provider::Ticket = payload.parse().context("invalid DCBACKUP payload")?;
     Ok(Qr::Backup { ticket })
 }
diff --git a/src/receive_imf/tests.rs b/src/receive_imf/tests.rs
index cf64ee3b5..44d3b8d9d 100644
--- a/src/receive_imf/tests.rs
+++ b/src/receive_imf/tests.rs
@@ -367,7 +367,6 @@ async fn test_no_message_id_header() {
     )
     .await
     .unwrap();
-    dbg!(&received);
     assert!(received.is_none());
 
     assert!(!t