Fix file processing
Minor fixes