diff --git a/install.sh b/install.sh
index 84bc9d6..86f4ec3 100755
--- a/install.sh
+++ b/install.sh
@@ -380,7 +380,8 @@ if [[ "$ARCH" == "armhf" ]] || [[ "$(uname -m)" =~ ^(armv6l|armv7l)$ ]]; then
         print_info "This saves ~20 minutes of compilation time on Pi Zero W"
 
         WHEEL_URL="https://github.com/torlando-tech/ble-reticulum/releases/download/armv6l-wheels-v1/dbus_fast-2.44.5-cp313-cp313-linux_armv6l.whl"
-        WHEEL_FILE="/tmp/dbus_fast-armv6l-$$.whl"
+        # Use proper wheel filename - pip extracts metadata from the filename
+        WHEEL_FILE="/tmp/dbus_fast-2.44.5-cp313-cp313-linux_armv6l.whl"
 
         if curl -sL "$WHEEL_URL" -o "$WHEEL_FILE" 2>/dev/null; then
             if [ -f "$WHEEL_FILE" ] && [ -s "$WHEEL_FILE" ]; then
diff --git a/src/RNS/Interfaces/BLEInterface.py b/src/RNS/Interfaces/BLEInterface.py
index 22ac5ba..44f9bb8 100644
--- a/src/RNS/Interfaces/BLEInterface.py
+++ b/src/RNS/Interfaces/BLEInterface.py
@@ -1036,9 +1036,11 @@ class BLEInterface(Interface):
             old_interface.detach()
             RNS.log(f"{self} detached stale interface for {identity_hash[:8]}", RNS.LOG_DEBUG)
 
-        # Clean up address mappings
+        # Clean up address mappings (both directions)
         if identity_hash in self.identity_to_address:
             del self.identity_to_address[identity_hash]
+        if old_address in self.address_to_identity:
+            del self.address_to_identity[old_address]
 
         # Clean up fragmenter/reassembler for old address
         if peer_identity: