more CASECLASS fixups