Mapping fixes.