Fix schema toggler
Minor fixes