More switch component tweaks