Some fixing on map component