Fix build break and increase wait condition timeouts.