Fixed problems with cancel and timeout.