Miscellaneous Bluetooth issues fix