Fixes in the EML to data-set migration