More fixes on the BluetoothService