Fix concurrency issues.