More file upload tweaks