Concurrency Fixes