Fix BT issues