Fix markers and paths