Added wait/checkout_timeout fixes