More case fixes