diff --git a/src/runtime2/communication.rs b/src/runtime2/communication.rs
index db992c070e8509a42d218b0a14cfeef565d0f096..b73cb11df5390e31ee5582c529b6f21a8494dba3 100644
--- a/src/runtime2/communication.rs
+++ b/src/runtime2/communication.rs
@@ -2,7 +2,7 @@ use crate::protocol::eval::*;
 use super::runtime::*;
 use super::component::*;
 
-#[derive(Copy, Clone)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub struct PortId(pub u32);
 
 
@@ -64,7 +64,7 @@ pub struct MessageDataHeader {
 }
 
 pub struct ControlMessage {
-    pub id: ControlId,
+    pub(crate) id: ControlId,
     pub sender_comp_id: CompId,
     pub target_port_id: Option<PortId>,
     pub content: ControlMessageContent,