the last mile of concurrency fixes