Fix additional casing issues