diff --git a/src/main/java/hu/jgj52/pvpcore/Commands/FfaCommand.java b/src/main/java/hu/jgj52/pvpcore/Commands/FfaCommand.java
index 4c415db..1b41c68 100644
--- a/src/main/java/hu/jgj52/pvpcore/Commands/FfaCommand.java
+++ b/src/main/java/hu/jgj52/pvpcore/Commands/FfaCommand.java
@@ -3,6 +3,7 @@ package hu.jgj52.pvpcore.Commands;
 import hu.jgj52.pvpcore.Main;
 import hu.jgj52.pvpcore.Utils.Kits;
 import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -29,6 +30,7 @@ public class FfaCommand implements CommandExecutor, TabCompleter {
                 player.getInventory().setContents(kitManager.getKit("ffa", player, false));
                 player.teleport(Bukkit.getWorld("ffa").getSpawnLocation());
                 plugin.playersInFfa.add(player);
+                player.setGameMode(GameMode.SURVIVAL);
             } catch (ExecutionException | InterruptedException e) {
                 throw new RuntimeException(e);
             }
diff --git a/src/main/java/hu/jgj52/pvpcore/Utils/WorldReset.java b/src/main/java/hu/jgj52/pvpcore/Utils/WorldReset.java
index 43f9d0b..abb9e2f 100644
--- a/src/main/java/hu/jgj52/pvpcore/Utils/WorldReset.java
+++ b/src/main/java/hu/jgj52/pvpcore/Utils/WorldReset.java
@@ -159,6 +159,9 @@ public class WorldReset {
                 world.setStorm(false);
                 world.setThundering(false);
                 world.setTime(6000);
+                WorldBorder border = world.getWorldBorder();
+                border.setCenter(0, 0);
+                border.setSize(300);
                 return true;
             } else {
                 plugin.getLogger().severe("Failed to create arena world!");