base uploader fixes