Some bluetooth fixes and changes