Fixed everything for upload