KRACOEUS-7719: fixing a variety of generator errors
Merge pull request #5 from leoherbie/KRACOEUS-7719

KRACOEUS-7719: fixing a variety of generator errors