Adding a few more waits.