Concurrency issues resolved