BlueZ related changes