diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/DoubleCoercionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/DoubleCoercionTest.java
new file mode 100755
index 00000000000..88160b75082
--- /dev/null
+++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/DoubleCoercionTest.java
@@ -0,0 +1,12 @@
+package com.sap.sailing.domain.common.test;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class DoubleCoercionTest {
+    @Test
+    public void testLongTimesDoubleCoercion() {
+        assertEquals(12l, (long) (15l * 0.5 + 0.5 * 10l));
+    }
+}
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 cb6cfe051b4..a882935dab2 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
@@ -1318,7 +1318,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
                 trackedRace.getRace().getCourse().unlockAfterRead();
             }
         }   
-        raceTimesInfo.currentServerTime = new Date();
+        if (raceTimesInfo != null) {
+            raceTimesInfo.currentServerTime = new Date();
+        }
         return raceTimesInfo;
     }
 
diff --git a/java/com.sap.sailing.www/browser-info.css b/java/com.sap.sailing.www/browser-info.css
old mode 100755
new mode 100644
diff --git a/java/com.sap.sailing.www/browser-info.html b/java/com.sap.sailing.www/browser-info.html
old mode 100755
new mode 100644
diff --git a/java/com.sap.sailing.www/postrace/normalize.css b/java/com.sap.sailing.www/postrace/normalize.css
old mode 100755
new mode 100644
diff --git a/java/com.sap.sailing.www/postrace/post-race-analytics-info.css b/java/com.sap.sailing.www/postrace/post-race-analytics-info.css
old mode 100755
new mode 100644
diff --git a/java/com.sap.sailing.www/postrace/post-race-analytics-info.html b/java/com.sap.sailing.www/postrace/post-race-analytics-info.html
old mode 100755
new mode 100644
index 3f2f61ff360..f09cea9ed41
Binary files a/java/com.sap.sailing.www/postrace/post-race-analytics-info.html and b/java/com.sap.sailing.www/postrace/post-race-analytics-info.html differ
diff --git a/java/com.sap.sailing.www/postrace/sap.ico b/java/com.sap.sailing.www/postrace/sap.ico
old mode 100755
new mode 100644