Few fix on the map