Fixes to uploader
merged