Added timeout fixes