diff --git a/sync-server/src/app_state/database/mutations.rs b/sync-server/src/app_state/database/mutations.rs
index 59383789..09f7a73b 100644
--- a/sync-server/src/app_state/database/mutations.rs
+++ b/sync-server/src/app_state/database/mutations.rs
@@ -1,4 +1,7 @@
-use super::{Database, Transaction, models::*};
+use super::{
+    Database, Transaction,
+    models::{EventRecord, FileManifest, StoredDocumentVersion, VaultUpdateId},
+};
 use anyhow::Result;
 
 impl Database {
diff --git a/sync-server/src/app_state/database/queries.rs b/sync-server/src/app_state/database/queries.rs
index edc77801..f9225ef4 100644
--- a/sync-server/src/app_state/database/queries.rs
+++ b/sync-server/src/app_state/database/queries.rs
@@ -1,4 +1,10 @@
-use super::{Database, Transaction, models::*};
+use super::{
+    Database, Transaction,
+    models::{
+        DocumentId, EventBatch, FileManifest, StoredDocumentVersion, VaultId, VaultSnapshot,
+        VaultUpdateId,
+    },
+};
 use anyhow::{Result, ensure};
 
 impl Database {
diff --git a/sync-server/src/server/endpoints/websocket.rs b/sync-server/src/server/endpoints/websocket.rs
index 97257215..2be4b8f2 100644
--- a/sync-server/src/server/endpoints/websocket.rs
+++ b/sync-server/src/server/endpoints/websocket.rs
@@ -75,7 +75,7 @@ async fn websocket(
     // notifications are only wakeups, so lag and commit/notify crashes are safe.
     let result = async {
         loop {
-            let batch = state.database.events_after(&vault, after).await.map_err(|error| server_error(error.into()))?;
+            let batch = state.database.events_after(&vault, after).await.map_err(server_error)?;
 
             if !batch.events.is_empty() {
                 let head = batch.head_event_id;
@@ -107,12 +107,12 @@ async fn websocket(
                             }
                         }
                     },
-                    Some(Ok(Message::Ping(_))) | Some(Ok(Message::Pong(_))) => {},
+                    Some(Ok(Message::Ping(_) | Message::Pong(_))) => {},
                     _ => break,
                 }
             }
         }
-        
+
         Ok(())
     }.await;