Bluetooth model fixes

For issue #142