Take better care of timeouts