Arrays and Map concurrency bug fixing