Fix case statements