Fix mappings.