Fixes to uploader.