Fixes for Bluez