generator fixes