Fixing issues with generation - to prepare for next steps.