Small fixes for switch/switchc modifier