fix some conflicting mappings