more timeout fixes