Additional concurrency fixes.