Fixed concurrency and blocking issues with Server