data generator fixes