fix concurrency issues we saw during the draft