Improvements to file processing.