Harden file management #57