Timeout fixes