fix some mapping for Partner