Fix two critical issues in Uploader