Make sure wait()s work

Make sure wait()s work