diff --git a/crates/jmap/src/blob/download.rs b/crates/jmap/src/blob/download.rs
index a01e3f2e7..2de27a937 100644
--- a/crates/jmap/src/blob/download.rs
+++ b/crates/jmap/src/blob/download.rs
@@ -41,7 +41,7 @@ use utils::BlobHash;
 use crate::{auth::AccessToken, JMAP};
 
 impl JMAP {
-    #[allow(clippy::blocks_in_if_conditions)]
+    #[allow(clippy::blocks_in_conditions)]
     pub async fn blob_download(
         &self,
         blob_id: &BlobId,
diff --git a/crates/jmap/src/blob/upload.rs b/crates/jmap/src/blob/upload.rs
index 8bf493bfa..abae38ba0 100644
--- a/crates/jmap/src/blob/upload.rs
+++ b/crates/jmap/src/blob/upload.rs
@@ -258,7 +258,7 @@ impl JMAP {
         })
     }
 
-    #[allow(clippy::blocks_in_if_conditions)]
+    #[allow(clippy::blocks_in_conditions)]
     pub async fn put_blob(
         &self,
         account_id: u32,
diff --git a/crates/jmap/src/email/ingest.rs b/crates/jmap/src/email/ingest.rs
index c55b8513e..bb83e39e8 100644
--- a/crates/jmap/src/email/ingest.rs
+++ b/crates/jmap/src/email/ingest.rs
@@ -81,7 +81,7 @@ pub struct IngestEmail<'x> {
 const MAX_RETRIES: u32 = 10;
 
 impl JMAP {
-    #[allow(clippy::blocks_in_if_conditions)]
+    #[allow(clippy::blocks_in_conditions)]
     pub async fn email_ingest(
         &self,
         mut params: IngestEmail<'_>,
diff --git a/crates/jmap/src/mailbox/set.rs b/crates/jmap/src/mailbox/set.rs
index 2bedb10c4..26d4c9164 100644
--- a/crates/jmap/src/mailbox/set.rs
+++ b/crates/jmap/src/mailbox/set.rs
@@ -89,7 +89,7 @@ pub static SCHEMA: &[IndexProperty] = &[
 ];
 
 impl JMAP {
-    #[allow(clippy::blocks_in_if_conditions)]
+    #[allow(clippy::blocks_in_conditions)]
     pub async fn mailbox_set(
         &self,
         mut request: SetRequest<SetArguments>,
@@ -523,7 +523,7 @@ impl JMAP {
         }
     }
 
-    #[allow(clippy::blocks_in_if_conditions)]
+    #[allow(clippy::blocks_in_conditions)]
     async fn mailbox_set_item(
         &self,
         changes_: Object<SetValue>,
diff --git a/crates/jmap/src/sieve/get.rs b/crates/jmap/src/sieve/get.rs
index 4b4d05f09..8522a85b2 100644
--- a/crates/jmap/src/sieve/get.rs
+++ b/crates/jmap/src/sieve/get.rs
@@ -178,6 +178,7 @@ impl JMAP {
         }
     }
 
+    #[allow(clippy::blocks_in_conditions)]
     async fn sieve_script_compile(
         &self,
         account_id: u32,
diff --git a/crates/jmap/src/sieve/ingest.rs b/crates/jmap/src/sieve/ingest.rs
index 9f87ff36f..f8a75e4d9 100644
--- a/crates/jmap/src/sieve/ingest.rs
+++ b/crates/jmap/src/sieve/ingest.rs
@@ -50,7 +50,7 @@ struct SieveMessage<'x> {
 }
 
 impl JMAP {
-    #[allow(clippy::blocks_in_if_conditions)]
+    #[allow(clippy::blocks_in_conditions)]
     pub async fn sieve_script_ingest(
         &self,
         raw_message: &[u8],
diff --git a/crates/jmap/src/sieve/set.rs b/crates/jmap/src/sieve/set.rs
index a76ee1222..6a37d1619 100644
--- a/crates/jmap/src/sieve/set.rs
+++ b/crates/jmap/src/sieve/set.rs
@@ -416,7 +416,7 @@ impl JMAP {
         Ok(true)
     }
 
-    #[allow(clippy::blocks_in_if_conditions)]
+    #[allow(clippy::blocks_in_conditions)]
     async fn sieve_set_item(
         &self,
         changes_: Object<SetValue>,
diff --git a/crates/smtp/src/reporting/mod.rs b/crates/smtp/src/reporting/mod.rs
index bb9c2c143..b8a194a1c 100644
--- a/crates/smtp/src/reporting/mod.rs
+++ b/crates/smtp/src/reporting/mod.rs
@@ -154,7 +154,7 @@ impl SMTP {
                 use rand::Rng;
                 use std::time::Duration;
 
-                let delivery_time = Duration::from_secs(rand::thread_rng().gen_range(0..10800));
+                let delivery_time = rand::thread_rng().gen_range(0u64..10800u64);
                 for domain in &mut message.domains {
                     domain.retry.due += delivery_time;
                     domain.expires += delivery_time;
diff --git a/crates/utils/src/listener/listen.rs b/crates/utils/src/listener/listen.rs
index bd3608d1d..be516f93b 100644
--- a/crates/utils/src/listener/listen.rs
+++ b/crates/utils/src/listener/listen.rs
@@ -153,7 +153,7 @@ impl Server {
                                 instance = instance.id,
                                 protocol = ?instance.protocol,
                                 "Listener shutting down.");
-                            manager.shutdown();
+                            manager.shutdown().await;
                             break;
                         }
                     };