Fix Concurrency issues