Bluetooth fixes