more fixes to load generator
...
...