Async timeout fixes