Fixed some problems with GeneratorUtil

No match.