More wait() to ready fixes