Minor updates on uploading