Tweaks to Build from file function