diff --git a/source/src/client.cpp b/source/src/client.cpp
index a3654af8..a49ee4d9 100644
--- a/source/src/client.cpp
+++ b/source/src/client.cpp
@@ -233,7 +233,7 @@ void addmsg(int type, const char *fmt, ...)
         va_end(args);
     }
     int num = nums?0:numi, msgsize = msgsizelookup(type);
-    if(msgsize && num!=msgsize) { s_sprintfd(s)("inconsistant msg size for %d (%d != %d)", type, num, msgsize); fatal(s); }
+    if(msgsize && num!=msgsize) { s_sprintfd(s)("inconsistent msg size for %d (%d != %d)", type, num, msgsize); fatal(s); }
     int len = p.length();
     messages.add(len&0xFF);
     messages.add((len>>8)|(reliable ? 0x80 : 0));
diff --git a/source/src/protocol.cpp b/source/src/protocol.cpp
index 6bfdf406..e2221a48 100644
--- a/source/src/protocol.cpp
+++ b/source/src/protocol.cpp
@@ -110,7 +110,7 @@ char msgsizesl[] =               // size inclusive message token, 0 for variable
     SV_TIMEUP, 2, SV_EDITENT, 10, SV_MAPRELOAD, 2, SV_ITEMACC, 2,
     SV_MAPCHANGE, 0, SV_ITEMSPAWN, 2, SV_ITEMPICKUP, 2,
     SV_PING, 2, SV_PONG, 2, SV_CLIENTPING, 2, SV_GAMEMODE, 2,
-    SV_EDITH, 7, SV_EDITT, 7, SV_EDITS, 6, SV_EDITD, 6, SV_EDITE, 6,
+    SV_EDITMODE, 2, SV_EDITH, 7, SV_EDITT, 7, SV_EDITS, 6, SV_EDITD, 6, SV_EDITE, 6,
     SV_SENDMAP, 0, SV_RECVMAP, 1, SV_SERVMSG, 0, SV_ITEMLIST, 0, SV_WEAPCHANGE, 2, SV_PRIMARYWEAP, 2,
     SV_MODELSKIN, 2,
     SV_FLAGPICKUP, 2, SV_FLAGDROP, 2, SV_FLAGRETURN, 2, SV_FLAGSCORE, 2, SV_FLAGRESET, 2, SV_FLAGINFO, 0, SV_FLAGS, 2,
diff --git a/source/src/server.cpp b/source/src/server.cpp
index a636c331..b3156dcd 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -821,7 +821,7 @@ void processevent(client *c, suicideevent &e)
 void processevent(client *c, pickupevent &e)
 {
     clientstate &gs = c->state;
-    if(!gs.isalive(gamemillis)) return;
+    if(m_mp(gamemode) && !gs.isalive(gamemillis)) return;
     serverpickup(e.ent, c->clientnum);
 }