Generators fixes