Fix up some mappings