Upload fixes