diff --git a/src/de/steamwar/bungeecore/SubserverSystem.java b/src/de/steamwar/bungeecore/SubserverSystem.java
index c7b743ee..1ad45c2e 100644
--- a/src/de/steamwar/bungeecore/SubserverSystem.java
+++ b/src/de/steamwar/bungeecore/SubserverSystem.java
@@ -37,7 +37,7 @@ public class SubserverSystem {
     public static Subserver startEventArena(EventFight eventFight, String serverName){
         int port = freePort(2500);
         return new Subserver(Servertype.ARENA, serverName, port,
-                MC_SCRIPT, "-a", eventFight.getSpielmodus().name(), serverName, Integer.toString(port), eventFight.getMap(), Integer.toString(eventFight.getFightID()));
+                MC_SCRIPT, "-a", eventFight.getSpielmodus().name(), serverName.replace(' ', '_'), Integer.toString(port), eventFight.getMap(), Integer.toString(eventFight.getFightID()));
     }
 
     public static void sendToBauServer(ProxiedPlayer p, UUID owner){
diff --git a/src/de/steamwar/bungeecore/commands/EventCommand.java b/src/de/steamwar/bungeecore/commands/EventCommand.java
index 2d74771f..94a5e4cf 100644
--- a/src/de/steamwar/bungeecore/commands/EventCommand.java
+++ b/src/de/steamwar/bungeecore/commands/EventCommand.java
@@ -97,7 +97,7 @@ public class EventCommand extends BasicCommand {
                     .append(fight.getStartTime().toLocalDateTime().format(TIME_FORMAT))
                     .append(" §e")
                     .append(blue.getTeamKuerzel())
-                    .append("§8:§e")
+                    .append("§8 vs §e")
                     .append(red.getTeamKuerzel());
 
             if(now.isAfter(fight.getStartTime().toInstant().plus(35, ChronoUnit.MINUTES))){
diff --git a/src/de/steamwar/bungeecore/listeners/ChatListener.java b/src/de/steamwar/bungeecore/listeners/ChatListener.java
index 458cabbe..6caf92e5 100644
--- a/src/de/steamwar/bungeecore/listeners/ChatListener.java
+++ b/src/de/steamwar/bungeecore/listeners/ChatListener.java
@@ -121,7 +121,11 @@ public class ChatListener extends BasicListener {
     public void onTabCompleteEvent(TabCompleteEvent e){
         List<String> suggestions = e.getSuggestions();
         String [] cursor = e.getCursor().split(" ");
-        String last = cursor[cursor.length - 1];
+        String last;
+        if(cursor.length != 0)
+            last = cursor[cursor.length - 1];
+        else
+            last = "";
         for(ProxiedPlayer player : ProxyServer.getInstance().getPlayers()){
             String name = player.getName();
             if(last.isEmpty() || name.startsWith(last)){