Mapping fixes 2