Merging fixes for data file handling