Improved handling of "sticky" modes and mode locks