Fixed BT issues