Fix a few things in generators.