Fixed concurrency stuff in master