Fixes for casing