Perform various fixes in apiv2 product