Fixed Concurrency

Fixed some issues with Concurrency.