fix some mappings