Minor Improvements to CSV and file services