diff --git a/Projekte/battleship/client/client.properties b/Projekte/battleship/client/client.properties
index 89d59df4..4403fa3b 100644
--- a/Projekte/battleship/client/client.properties
+++ b/Projekte/battleship/client/client.properties
@@ -9,7 +9,7 @@
 #
 # Specifies the map used by the opponent in single mode.
 # Single mode is activated if this property is set.
-map.opponent=maps/map2.json
+#map.opponent=maps/map2.json
 #
 # Specifies the map used by the player in single mode.
 # The player must define their own map if this property is not set.
diff --git a/Projekte/battleship/client/src/main/java/pp/battleship/client/server/BattleshipServer.java b/Projekte/battleship/client/src/main/java/pp/battleship/client/server/BattleshipServer.java
index 67b5e9f9..1feb9564 100644
--- a/Projekte/battleship/client/src/main/java/pp/battleship/client/server/BattleshipServer.java
+++ b/Projekte/battleship/client/src/main/java/pp/battleship/client/server/BattleshipServer.java
@@ -45,7 +45,7 @@ public class BattleshipServer implements MessageListener<HostedConnection>, Conn
     private static final Logger LOGGER = System.getLogger(BattleshipServer.class.getName());
     private static final File CONFIG_FILE = new File("server.properties");
 
-    private static int PORT;
+    private static int port;
 
     private final BattleshipConfig config = new BattleshipConfig();
     private Server myServer;
@@ -69,7 +69,7 @@ public class BattleshipServer implements MessageListener<HostedConnection>, Conn
      */
     public BattleshipServer(int port) {
         config.readFromIfExists(CONFIG_FILE);
-        PORT = port;
+        BattleshipServer.port = port;
         LOGGER.log(Level.INFO, "Configuration: {0}", config); //NON-NLS
         logic = new ServerGameLogic(this, config);
     }
@@ -83,7 +83,7 @@ public void run() {
     private void startServer() {
         try {
             LOGGER.log(Level.INFO, "Starting server..."); //NON-NLS
-            myServer = Network.createServer(PORT);
+            myServer = Network.createServer(port);
             initializeSerializables();
             myServer.start();
             registerListeners();
diff --git a/Projekte/battleship/model/src/main/java/pp/battleship/notification/GameEventListener.java b/Projekte/battleship/model/src/main/java/pp/battleship/notification/GameEventListener.java
index 8025476b..0aa54b70 100644
--- a/Projekte/battleship/model/src/main/java/pp/battleship/notification/GameEventListener.java
+++ b/Projekte/battleship/model/src/main/java/pp/battleship/notification/GameEventListener.java
@@ -51,5 +51,5 @@ default void receivedEvent(ClientStateEvent event) { /* do nothing */ }
      *
      * @param event the received Event
      */
-    default void receivedEvent(MusicEvent event) { /* do nothing */ };
+    default void receivedEvent(MusicEvent event) { /* do nothing */ }
 }