fix up more enums