Adjust to new cp.Wait usage