Tweak toMarker
Improve type