Fixed some concurrency issues on MapDataStore