Bluetooth Fixes