More wait message fixes.