fix uploader bugs