Update for loss of wait_success