Fix some concurrency issues