Small changes in PicGenerator