Uploading fixes