uploader fixes