diff --git a/minetest.conf b/minetest.conf
index c431733..fa2490f 100644
--- a/minetest.conf
+++ b/minetest.conf
@@ -14,7 +14,8 @@ ctf.colors.skins = true
 ctf.colors.nametag = false
 
 ctf.flag.capture_take = true
-ctf.flag.waypoints
+ctf.flag.waypoints = true
+ctf.flag.nobuild_radius = 3
 
 ctf.allocate_mode = 3
 ctf.diplomacy = false
@@ -29,7 +30,7 @@ ctf.match.clear_inv = true
 ctf.match.destroy_team = true
 ctf.match.reset_on_winner = true
 ctf.match.map_reset_limit = 160
-ctf.match.remove_player_on_leave
+ctf.match.remove_player_on_leave = true
 
 ctf.gui.tab.flags = false
 ctf.gui.tab.settings = false
diff --git a/mods/ctf_pvp_engine b/mods/ctf_pvp_engine
index 685cd18..0a4f30d 160000
--- a/mods/ctf_pvp_engine
+++ b/mods/ctf_pvp_engine
@@ -1 +1 @@
-Subproject commit 685cd18ecd4ce71b9313c377f80ef6b2351f6f8b
+Subproject commit 0a4f30df25a96f250d4a994a7e101a9e3225c063