Fixes for Bluetooth, and Commonization