More case fixes;