Fix Mapping remarks