Fixes for Bluez 2