Merge "Few minor codegen fixes"