Concurrency fixes.