small fixes in the generator
Merge pull request #193 from yjbanov/generator-fixes

Generator fixes