async timeout handling tweaks