attempt to fix some mappings