Shorter timeouts?