More concurrency fixes