Fix up ToggleManager