More fixing for the toggler stuff in general