Uploading tweaks