Some more case changes