Tweaks to File IO