some bluetooth fixes from CM