diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
index 05f4efae4ec..65b2df51850 100755
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
@@ -410,8 +410,8 @@ public class TransientCompetitorStoreImpl implements CompetitorStore, Serializab
     @Override
     public void addNewCompetitorsWithBoat(Iterable<CompetitorWithBoat> competitors) {
         for (CompetitorWithBoat competitor: competitors) {
+            addNewBoat(competitor.getBoat()); // create the boat before the competitor because the competitor references the boat
             addNewCompetitor(competitor);
-            addNewBoat(competitor.getBoat());
         }
     }
 
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 ae69f6ba76d..519017cabb2 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
@@ -5071,7 +5071,6 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
                 /* flag image */ null, team,
                 competitorDescriptor.getTimeOnTimeFactor(),
                 competitorDescriptor.getTimeOnDistanceAllowancePerNauticalMile(), searchTag, boat);
-        
         return competitorWithBoat;
     }
 
diff --git a/java/com.sap.sailing.manage2sail/src/com/sap/sailing/manage2sail/Manage2SailEventResultsParserImpl.java b/java/com.sap.sailing.manage2sail/src/com/sap/sailing/manage2sail/Manage2SailEventResultsParserImpl.java
index 46d0ffc8c2c..b39887ec1c4 100644
--- a/java/com.sap.sailing.manage2sail/src/com/sap/sailing/manage2sail/Manage2SailEventResultsParserImpl.java
+++ b/java/com.sap.sailing.manage2sail/src/com/sap/sailing/manage2sail/Manage2SailEventResultsParserImpl.java
@@ -64,14 +64,12 @@ public class Manage2SailEventResultsParserImpl implements Manage2SailEventResult
                 regattaResult.setHtmlUrl(parseURL(jsonRegatta, "HtmlUrl"));
                 regattaResult.setPublishedAt(parseDate(jsonRegatta, "Published"));
                 regattaResult.setIsFinal((Boolean) jsonRegatta.get("Final"));
-                
                 JSONArray jsonRaces = (JSONArray) jsonRegatta.get("Races");
                 if(jsonRaces != null) {
                     for (Object raceObject: jsonRaces) {
                         RaceResultDescriptor raceResult = new RaceResultDescriptor(); 
                         JSONObject jsonRace = (JSONObject) raceObject;
                         raceResult.setId((String) jsonRace.get("Id"));
-                        // TODO fetch XrrEntriesUrl for competitor information, instead of depending on STL message for competitor details
                         raceResult.setName((String) jsonRace.get("Name"));
                         raceResult.setRaceColumnNumber(parseInteger(jsonRace, "RaceIndex"));
                         raceResult.setStatus((String) jsonRace.get("Status"));