diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 25ee706f..448453ff 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -395,7 +395,7 @@ void findplayerstart(playerent *d, bool mapcenter, int arenaspawn)
     if(!mapcenter)
     {
         int type = m_teammode ? team_int(d->team) : 100;
-        if(m_arena && arenaspawn > -1)
+        if(m_arena && arenaspawn >= 0)
         {
             int x = -1;
             loopi(arenaspawn + 1) x = findentity(PLAYERSTART, x+1, type);
diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 7343cc82..58b81c3e 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -250,12 +250,6 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
                 break;
             }
 
-            case SV_SPAWNLIST:
-            {
-                if(getint(p) > 0) loopi(5) getint(p);
-                break;
-            }
-
             case SV_MAPRELOAD:          // server requests next map
             {
                 getint(p);
diff --git a/source/src/entity.h b/source/src/entity.h
index 65b78924..f72d9d80 100644
--- a/source/src/entity.h
+++ b/source/src/entity.h
@@ -115,6 +115,7 @@ struct physent
     void resetinterp()
     {
         newpos = o;
+        newpos.z -= eyeheight;
         deltapos = vec(0, 0, 0);
     }
 
diff --git a/source/src/protos.h b/source/src/protos.h
index a94bb871..9e7f882e 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -340,7 +340,7 @@ extern void flagidle(int flag);
 extern void flagmsg(int flag, int message, int actor, int flagtime);
 extern void arenarespawn();
 extern bool tryrespawn();
-extern void findplayerstart(playerent *d, bool mapcenter=false, int arenaspawn=-1);
+extern void findplayerstart(playerent *d, bool mapcenter = false, int arenaspawn = -1);
 extern void serveropcommand(int cmd, int arg1);
 extern void refreshsopmenu(void *menu, bool init);
 extern char *colorname(playerent *d, int num = 0, char *name = NULL, const char *prefix = "");
diff --git a/source/src/server.cpp b/source/src/server.cpp
index 6d90dd11..949a9610 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -2543,7 +2543,6 @@ void process(ENetPacket *packet, int sender, int chan)   // sender may be -1
                     loopi(3) clnumspawn[i] = getint(p);
                     loopi(2) clnumflagspawn[i] = getint(p);
                 }
-                QUEUE_MSG;
                 break;
             }