Fixing retry and upload

:1234: