Fixes in PP generator