Mapping fixes for transition from self submission to a dataset