Fixes for no pairing mode