Fixes to mapping.