KRACOEUS-7719: fixing a variety of generator errors