StoreMap fixes