diff --git a/src/runtime2/component/component.rs b/src/runtime2/component/component.rs
index 245ad152d4210f97b46e8fe5aa0d762d77df67a7..135b41875ecc54b9a89055b13c4eae4e40856b2c 100644
--- a/src/runtime2/component/component.rs
+++ b/src/runtime2/component/component.rs
@@ -243,7 +243,7 @@ pub(crate) fn default_handle_start_exit(
         let port_handle = comp_ctx.get_port_handle(port_id);
         let (peer, message) = control.initiate_port_closing(port_handle, comp_ctx);
         let peer_info = comp_ctx.get_peer(peer);
-        peer_info.handle.send_message(sched_ctx, Message::Control(message), true);
+        peer_info.handle.send_message(&sched_ctx.runtime, Message::Control(message), true);
     }
 
     return CompScheduling::Immediate; // to check if we can shut down immediately
@@ -289,7 +289,7 @@ fn default_handle_ack(
             AckAction::SendMessage(target_comp, message) => {
                 // FIX @NoDirectHandle
                 let mut handle = sched_ctx.runtime.get_component_public(target_comp);
-                handle.send_message(sched_ctx, Message::Control(message), true);
+                handle.send_message(&sched_ctx.runtime, Message::Control(message), true);
                 let _should_remove = handle.decrement_users();
                 debug_assert!(_should_remove.is_none());
             },
@@ -321,7 +321,7 @@ fn default_send_ack(
     sched_ctx: &SchedulerCtx, comp_ctx: &CompCtx
 ) {
     let peer_info = comp_ctx.get_peer(peer_handle);
-    peer_info.handle.send_message(sched_ctx, Message::Control(ControlMessage{
+    peer_info.handle.send_message(&sched_ctx.runtime, Message::Control(ControlMessage{
         id: causer_of_ack_id,
         sender_comp_id: comp_ctx.id,
         target_port_id: None,
@@ -350,7 +350,7 @@ fn default_handle_unblock_put(
         // Retrieve peer to send the message
         let peer_handle = comp_ctx.get_peer_handle(port_info.peer_comp_id);
         let peer_info = comp_ctx.get_peer(peer_handle);
-        peer_info.handle.send_message(sched_ctx, Message::Data(to_send), true);
+        peer_info.handle.send_message(&sched_ctx.runtime, Message::Data(to_send), true);
 
         exec_state.mode = CompMode::Sync; // because we're blocked on a `put`, we must've started in the sync state.
         exec_state.mode_port = PortId::new_invalid();