Inconsistent case management

Other alight issues: