fixed up bluez5 support code