Fixes to new switch style