Fixed adding multiple wait operations, and not cleaning them up if there are no more servers to call.