Various fixes for the auto-toggling modes.