diff --git a/plume-models/src/comments.rs b/plume-models/src/comments.rs
index 0809aab5..09f26a35 100644
--- a/plume-models/src/comments.rs
+++ b/plume-models/src/comments.rs
@@ -304,14 +304,13 @@ impl FromId<DbConn> for Comment {
                 .chain(bcc)
                 .collect::<HashSet<_>>() // remove duplicates (don't do a query more than once)
                 .into_iter()
-                .map(|v| {
+                .flat_map(|v| {
                     if let Ok(user) = User::from_id(conn, &v, None, CONFIG.proxy()) {
                         vec![user]
                     } else {
                         vec![] // TODO try to fetch collection
                     }
                 })
-                .flatten()
                 .filter(|u| u.get_instance(conn).map(|i| i.local).unwrap_or(false))
                 .collect::<HashSet<User>>(); //remove duplicates (prevent db error)
 
diff --git a/plume-models/src/search/tokenizer.rs b/plume-models/src/search/tokenizer.rs
index 52cd62b2..83228e67 100644
--- a/plume-models/src/search/tokenizer.rs
+++ b/plume-models/src/search/tokenizer.rs
@@ -57,7 +57,7 @@ impl<'a> WhitespaceTokenStream<'a> {
             .filter(|&(_, ref c)| c.is_whitespace())
             .map(|(offset, _)| offset)
             .next()
-            .unwrap_or_else(|| self.text.len())
+            .unwrap_or(self.text.len())
     }
 }