Final changes for Bluetooth (CM)