fixes for Waiter race condition