More wait/retry fixes.