Further updates to data set compatibility wrangling