diff --git a/core/conversations/src/conversation/group_v2.rs b/core/conversations/src/conversation/group_v2.rs
index 9b4d19a..2ea98b6 100644
--- a/core/conversations/src/conversation/group_v2.rs
+++ b/core/conversations/src/conversation/group_v2.rs
@@ -22,7 +22,6 @@ use de_mls::protos::de_mls::messages::v1::{
 use de_mls::session::{Conversation, ConversationConfig, ConversationDeps};
 use hashgraph_like_consensus::signing::EthereumConsensusSigner;
 use prost::Message;
-use rand;
 use shared_traits::{IdentId, IdentIdRef};
 use std::sync::Arc;
 use std::time::Duration;
@@ -457,7 +456,7 @@ impl GroupV2Convo {
             ConversationEvent::AppMessage(AppMessageProto {
                 payload: Some(app_message::Payload::ConversationMessage(cm)),
             }) => Some(ConvoOutcome {
-                convo_id: self.convo_id.clone().into(),
+                convo_id: self.convo_id.clone(),
                 content: Some(Content {
                     bytes: cm.message.clone(),
                 }),
diff --git a/core/conversations/src/core.rs b/core/conversations/src/core.rs
index 274a0d4..109e6ba 100644
--- a/core/conversations/src/core.rs
+++ b/core/conversations/src/core.rs
@@ -323,7 +323,7 @@ impl<'a, S: ExternalServices + 'static> Core<S> {
 
         match convo_id {
             c if c == self.inbox.id() => self.dispatch_to_inbox(&env.payload).map(Into::into),
-            c if c == self.pq_inbox.id() => self.dispatch_to_inbox2(&env.payload).map(Into::into),
+            c if c == self.pq_inbox.id() => self.dispatch_to_inbox2(&env.payload),
             c if self.cached_convos.contains_key(&c) => {
                 self.dispatch_to_convo(&c, &env.payload).map(Into::into)
             }
@@ -354,7 +354,7 @@ impl<'a, S: ExternalServices + 'static> Core<S> {
 
             Ok(PayloadOutcome::Inbox(InboxOutcome {
                 new_conversation: crate::NewConversation {
-                    convo_id: convo_id,
+                    convo_id,
                     class: crate::ConversationClass::Group,
                 },
                 initial: None,
diff --git a/core/integration_tests_core/src/test_client.rs b/core/integration_tests_core/src/test_client.rs
index 62b7d8f..3843f93 100644
--- a/core/integration_tests_core/src/test_client.rs
+++ b/core/integration_tests_core/src/test_client.rs
@@ -11,6 +11,8 @@ use components::{EphemeralRegistry, LocalBroadcaster, MemStore};
 
 use crate::wakeup::{TestWakeupProvider, TestWakeupService, WakeupRecord};
 
+type OnMessageCallback = dyn Fn(&TestClient, PayloadOutcome);
+
 type WS = TestWakeupService;
 type WP = TestWakeupProvider;
 
@@ -130,7 +132,7 @@ pub struct TestHarness<const N: usize> {
     addresses: HashMap<usize, IdentId>,
     clients: Vec<TestClient>,
     wakeup_service: WS,
-    cb: Box<dyn Fn(&TestClient, PayloadOutcome)>,
+    cb: Box<OnMessageCallback>,
     // List of outcomes that were detected across all clients.
     pub observed_outcomes: Vec<Observation>,
 }