Small improvements to the File handling module