Fixing retry and upload