Fixes to Switch, and some simplifications