diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index e70b4f27..c67109fd 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -235,7 +235,7 @@ public class GameState implements Runnable {
         // TODO: 15/08/17 remove magic numbers from these equations.
         if (yacht.getSailIn()) {
             if (velocity < maxBoatSpeed - 500) {
-                yacht.changeVelocity(maxBoatSpeed / 150);
+                yacht.changeVelocity(maxBoatSpeed / 100);
             } else if (velocity > maxBoatSpeed + 500) {
                 yacht.changeVelocity(-maxBoatSpeed / 100);
             } else {
diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java
index f70c0a13..09327fe2 100644
--- a/src/main/java/seng302/visualiser/GameClient.java
+++ b/src/main/java/seng302/visualiser/GameClient.java
@@ -159,8 +159,11 @@ public class GameClient {
         FXMLLoader fxmlLoader = new FXMLLoader(
             getClass().getResource("/views/FinishScreenView.fxml"));
         try {
-            holderPane.getChildren().clear();
-            holderPane.getChildren().add(fxmlLoader.load());
+            final Node finishScreenFX = fxmlLoader.load();
+            Platform.runLater(() -> {
+                holderPane.getChildren().clear();
+                holderPane.getChildren().add(finishScreenFX);
+            });
         } catch (IOException e) {
             e.printStackTrace();
         }