Tweak some state transitions for a better user experience.