More code generation changes