Misc fixes
Fixes to uploader