OZP-64: Adding more waitFors