Changes for bluez