Fix bugs with crossover control not resetting correctly