Some more inconsistent case fixes