Fixes for Bluez 3