Bug fixes to loadFile recommit