Fix and Upgrade in the generator