Marker fixes