fixes to waitForAll