More fixes to generated files