Fix oversights with uploader.