Fix data migration issues with DOI and TrashCan