More Bluetooth fixes