Fix some unite mappings.