Changed timeouts to more closely align with current (infinite) behavior