minor generator fixes