Fixed some generated code issues.