Fixup some more enums.