Boolean toggles fixes

Oops.