"Wait until" async improvements