Final fixes to Uploader