Add fixes to upload.