Concurrency fixes