WIP: fix retry for uploadFile w/stream, update request