diff --git a/config/survival.cfg b/config/survival.cfg
index 74e73460..c53f4cc1 100644
--- a/config/survival.cfg
+++ b/config/survival.cfg
@@ -42,7 +42,7 @@ const survival [
             survTimeBetKills = (- (millis) $startSurvMillis)         //
           ] [ add2list survTimeBetKills (- (millis) $survLastKill) ] // Other kills
           survLastKill = (millis)                                    // Update last kill
-        ] [ if (= $arg2 (player1 cn)) [ add2list tmpSurvSets (concat $arg1 $arg2 $arg3 $arg4 (findpn $arg1)) ] ] // Player1 was target, pass arguments/data along for use in the after game results/stats messages.
+        ] [ if (= $arg2 (player1 cn)) [ add2list tmpSurvSets (concat $arg1 $arg2 $arg3 $arg4 (player $arg1 name)) ] ] // Player1 was target, pass arguments/data along for use in the after game results/stats messages.
       ]
     ]
   ]
diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 5ca24412..a020a570 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -788,7 +788,7 @@ int waiting_permission = 0;
 
 bool tryrespawn()
 {
-    if ( m_mp(gamemode) && bad_map() )
+    if ( m_mp(gamemode) && multiplayer(false) && bad_map() )
     {
         hudoutf("This map is not supported in multiplayer. Read the docs about map quality/dimensions.");
     }