codegen changes fixed