Casing fixes