Fix up switching between mappings