Markers fixes