Fix casing problems