Fixed switch statements