fixed some warnings in generated files. Still not perfect...