timeout fixes