More casing fixes.