Long running put: fix some bugs