Some modifications in code generation