Update Timeout semantics in a few more places