more casing fixes