Fix switch instructions