Fixed issues with new enumerators.