More Bluetooth Connection fixes