Removed warning
Fixed concurrency issues