Tweaks to file upload