More tweaks to file upload