Minor changes to Switch.