Correct some edge cases around toggling overrides
Correct stacking of overrides