diff --git a/racevisionGame/src/main/java/shared/model/RaceClock.java b/racevisionGame/src/main/java/shared/model/RaceClock.java
index 3ce61245..9a1d4e84 100644
--- a/racevisionGame/src/main/java/shared/model/RaceClock.java
+++ b/racevisionGame/src/main/java/shared/model/RaceClock.java
@@ -68,11 +68,11 @@ public class RaceClock {
     /**
      * Format string used for duration before it has started.
      */
-    private String durationBeforeStartFormat = "Starting in: %02d:%02d:%02d";
+    private String durationBeforeStartFormat = "%02d:%02d:%02d";
     /**
      * Format string used for duration once the race has started.
      */
-    private String durationAfterStartFormat = "Time: %02d:%02d:%02d";
+    private String durationAfterStartFormat = "%02d:%02d:%02d";
 
 
 
diff --git a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
index cc75bd99..83ca7175 100644
--- a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
+++ b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
@@ -796,7 +796,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
     private Color getLineColor(Leg leg) {
         for (VisualiserBoat boat : raceState.getBoats()) {
             if (boat.isClientBoat()) {
-                if (boat.getCurrentLeg() == leg) {
+                if (boat.getCurrentLeg().getLegNumber() == leg.getLegNumber()) {
                     return Color.ORANGE;
                 } else {
                     return Color.MEDIUMAQUAMARINE;