Fixes to upload