File handling fixes

Created by: JoeMurray

Although Karin indicated that these changes had already been incorporated into a version worked on at the sprint, here's a formal PR nonetheless.