fixes to the genpact merge