Fixed some of the timeout problems.