Bug fixes around installing mappings