Amend mappings to correct functionality.
Merge branch 'mappings'