Better handling of BT state.