diff --git a/source/server/main.qc b/source/server/main.qc
index 3a64815..6f49aa4 100644
--- a/source/server/main.qc
+++ b/source/server/main.qc
@@ -138,7 +138,7 @@ void() precaches =
 	precache_model ("models/sprites/explosion.spr");
 	precache_model ("models/sprites/null.spr");
 
-	if (waypoint_mode) {
+	if (cvar("waypoint_mode")) {
 		precache_model ("models/way/current_way.spr");
 		precache_model ("models/way/current_way_door.spr");
 		precache_model ("models/way/last_way.spr");
diff --git a/source/server/weapons/weapon_core.qc b/source/server/weapons/weapon_core.qc
index 6214f43..08b009d 100644
--- a/source/server/weapons/weapon_core.qc
+++ b/source/server/weapons/weapon_core.qc
@@ -1687,6 +1687,7 @@ void () Impulse_Functions =
 			}
 			
 			waypoint_mode = 1;
+			localcmd("restart\n");
 			break;
 		default: