More fixes for BT headset, Big Thanks to SlugZero