Concurrency fixes.
Final fixes.