concurrency fixes