Use agent request timeout in more places