Uploader bug fixes