diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceColumnInLeaderboardDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceColumnInLeaderboardDialog.java
index 5e0f4ec29c1..d587fc99354 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceColumnInLeaderboardDialog.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceColumnInLeaderboardDialog.java
@@ -70,7 +70,7 @@ public class RaceColumnInLeaderboardDialog extends DataEntryDialog<RaceColumnInL
             String errorMessage;
             String racename = valueToValidate.getName();
             Boolean isMedalRace = valueToValidate.isMedalRace();
-            boolean isNameNotEmpty = racename != null & racename != "";
+            boolean isNameNotEmpty = racename != null & !racename.isEmpty();
             boolean medalRaceNotNull = isMedalRace != null;
 
             boolean unique = true;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingReplayConnectorPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingReplayConnectorPanel.java
index a56d63b7982..79285a5a5d0 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingReplayConnectorPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingReplayConnectorPanel.java
@@ -411,7 +411,7 @@ public class SwissTimingReplayConnectorPanel extends AbstractEventManagementPane
         raceList.getList().clear();
         if (text != null && !text.isEmpty()) {
             for (SwissTimingReplayRaceDTO replayRace : availableSwissTimingRaces) {
-                boolean found = textContainsStringsToCheck(wordsToFilter, replayRace.boat_class, replayRace.flight_number, replayRace.name, replayRace.race_id);
+                boolean found = textContainsStringsToCheck(wordsToFilter, replayRace.boat_class, replayRace.flight_number, replayRace.name, replayRace.race_id, replayRace.rsc);
                 if (found) {
                     raceList.getList().add(replayRace);
                 }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/WindChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/WindChart.java
index 2af1e3e8f62..618ad81d66b 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/WindChart.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/WindChart.java
@@ -402,10 +402,10 @@ public class WindChart extends RaceChart implements Component<WindChartSettings>
             double deltaMax = Math.abs(yMax - y);
 
             double yDown = y - 360;
-            double deltaMinDown = Math.abs(yMin - Math.abs(yDown));
+            double deltaMinDown = Math.abs(yMin - yDown);
 
             double yUp = y + 360;
-            double deltaMaxUp = Math.abs(yMax - Math.abs(yUp));
+            double deltaMaxUp = Math.abs(yMax - yUp);
 
             if (!(deltaMin <= deltaMinDown && deltaMin <= deltaMaxUp)
                     && !(deltaMax <= deltaMinDown && deltaMax <= deltaMaxUp)) {