Fix switch statements