More ToggleSwitch fixes

#1652 
Pretty stupid I missed that warning...