Improve timeouts.