Correct the Switch* scripts