Minor tweeks to mappings