Small fixes to make the toggle available