More data scrubbing on loading files and warnings for data being discarded