Fix uploads and some other stuff
Fix uploads and some other stuff