diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java
index 50f4af8a662..c8eba0b2e79 100755
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java
@@ -440,7 +440,7 @@ public enum DetailType implements Serializable {
         final Collection<DetailType> allowed = new LinkedHashSet<>();
         allowed.add(RACE_CALCULATED_TIME_AT_ESTIMATED_ARRIVAL_AT_COMPETITOR_FARTHEST_AHEAD);
         allowed.add(RACE_CALCULATED_TIME_TRAVELED);
-        allowed.add(DetailType.RACE_IMPLIED_WIND);
+        allowed.add(RACE_IMPLIED_WIND);
         return allowed;
     }
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
index ff0efd21c50..ea7e5e371b0 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
@@ -32,6 +32,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -3608,7 +3609,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
                             (ORCPerformanceCurveRankingMetric) rankingMetric;
                     try {
                         final Speed impliedWind = orcPcsRankingMetric.getImpliedWind(competitor, timePoint, cache);
-                        result = impliedWind.getKnots();
+                        result = impliedWind == null ? null : impliedWind.getKnots();
                     } catch (MaxIterationsExceededException | FunctionEvaluationException e) {
                         logger.log(Level.WARNING, "Problem computing implied wind", e);
                         result = null;
@@ -8327,7 +8328,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
 
     @Override
     public Iterable<DetailType> determineDetailTypesForCompetitorChart(String leaderboardGroupName, RegattaAndRaceIdentifier identifier) {
-        final List<DetailType> availableDetailsTypes = new ArrayList<>();
+        final LinkedHashSet<DetailType> availableDetailsTypes = new LinkedHashSet<>();
         availableDetailsTypes.addAll(DetailType.getAutoplayDetailTypesForChart());
         availableDetailsTypes.removeAll(DetailType.getRaceBravoDetailTypes());
         final DynamicTrackedRace trackedRace = getService().getTrackedRace(identifier);