Tweaks for working file upload stuff