Fixes to mappings.