A few fixes for the wait-aware sequentialization.