Tweaks to file content code