Update for bluez5 changes