Fix recursive import, typo in EnumField