diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/StartAnalysisMode.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/StartAnalysisMode.java
index 437cd970585..1a29e2964b5 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/StartAnalysisMode.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/StartAnalysisMode.java
@@ -53,7 +53,7 @@ public class StartAnalysisMode extends RaceBoardModeWithPerRaceCompetitors {
 
     @Override
     protected void updateCompetitorSelection() {
-        updateCompetitorSelection(/* howManyTopCompetitorsInRaceToSelect */ 3, getLeaderboard());
+        updateCompetitorSelection(/* howManyTopCompetitorsInRaceToSelect */ 3, getLeaderboardForSpecificTimePoint());
     }
 
     private void adjustMapSettings() {
@@ -166,6 +166,7 @@ public class StartAnalysisMode extends RaceBoardModeWithPerRaceCompetitors {
         raceDetailsToShow.add(DetailType.SPEED_OVER_GROUND_AT_RACE_START);
         raceDetailsToShow.add(DetailType.SPEED_OVER_GROUND_WHEN_PASSING_START);
         raceDetailsToShow.add(DetailType.START_TACK);
+        raceDetailsToShow.add(DetailType.RACE_GAP_TO_LEADER_IN_SECONDS);
         raceDetailsToShow.remove(DetailType.DISPLAY_LEGS);
         final LeaderboardSettings newSettings = new LeaderboardSettings(existingSettings.getManeuverDetailsToShow(),
                 existingSettings.getLegDetailsToShow(),
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/WinningLanesMode.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/WinningLanesMode.java
index 3f6689ae76c..4dfec799fac 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/WinningLanesMode.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/WinningLanesMode.java
@@ -33,7 +33,7 @@ public class WinningLanesMode extends RaceBoardModeWithPerRaceCompetitors {
     @Override
     protected void updateCompetitorSelection() {
         final int howManyCompetitorsToSelect = getHowManyCompetitorsToSelect(getLeaderboardPanel().getCompetitors(getRaceIdentifier()));
-        updateCompetitorSelection(howManyCompetitorsToSelect, getLeaderboard());
+        updateCompetitorSelection(howManyCompetitorsToSelect, getLeaderboardForSpecificTimePoint());
     }
 
     private void adjustLeaderboardSettings() {