fix some mapping.