diff --git a/v2/crates/wifi-densepose-desktop/src/commands/discovery.rs b/v2/crates/wifi-densepose-desktop/src/commands/discovery.rs
index 892ac66b..4608590e 100644
--- a/v2/crates/wifi-densepose-desktop/src/commands/discovery.rs
+++ b/v2/crates/wifi-densepose-desktop/src/commands/discovery.rs
@@ -355,7 +355,7 @@ pub async fn list_serial_ports() -> Result<Vec<SerialPortInfo>, String> {
 fn list_serial_ports_fallback() -> Result<Vec<SerialPortInfo>, String> {
     tracing::info!("Using fallback serial port listing");
 
-    let result = Vec::new();
+    let mut result = Vec::new();
 
     // List /dev/cu.usb* devices on macOS
     #[cfg(target_os = "macos")]
diff --git a/v2/crates/wifi-densepose-sensing-server/src/matter/bridge.rs b/v2/crates/wifi-densepose-sensing-server/src/matter/bridge.rs
index 778b28f2..c6b86308 100644
--- a/v2/crates/wifi-densepose-sensing-server/src/matter/bridge.rs
+++ b/v2/crates/wifi-densepose-sensing-server/src/matter/bridge.rs
@@ -23,7 +23,8 @@
 use crate::mqtt::discovery::EntityKind;
 
 use super::clusters::{
-    matter_mapping, DEVICE_TYPE_AGGREGATOR,
+    matter_mapping, MatterClusterMapping, DEVICE_TYPE_AGGREGATOR,
+    DEVICE_TYPE_BRIDGED_NODE,
 };
 
 /// One endpoint on the Matter device tree.
@@ -106,7 +107,7 @@ pub fn build_bridge_tree(nodes: &[(String, String, Vec<EntityKind>)]) -> BridgeT
 
             let ep_id = next_endpoint;
             next_endpoint += 1;
-            let ep = Endpoint {
+            let mut ep = Endpoint {
                 endpoint_id: ep_id,
                 device_type: m.device_type,
                 label: format!("{:?}", entity),
diff --git a/v2/crates/wifi-densepose-sensing-server/src/matter/commissioning.rs b/v2/crates/wifi-densepose-sensing-server/src/matter/commissioning.rs
index 2886810a..6f57b057 100644
--- a/v2/crates/wifi-densepose-sensing-server/src/matter/commissioning.rs
+++ b/v2/crates/wifi-densepose-sensing-server/src/matter/commissioning.rs
@@ -40,7 +40,7 @@
 //! vector `(passcode=20202021, discriminator=3840)` encodes to the
 //! Matter-published `34970112332`.
 
- // re-export-only guard
+use super::super::matter::clusters::VENDOR_ATTR_PERSON_COUNT as _; // re-export-only guard
 
 /// Inputs to setup-code generation. `passcode` and `discriminator`
 /// are usually random at first start and persisted in the