1.0

Fixes to make the generator work with 1.0 branch.