red fixes for waits