Generator fixes