generated data fixes
Merge pull request #3335 from kurund/gendata-fixes

generated data fixes