Improve timeout behavior.