Fixes for Bluez 4