diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 54d3f9cc..1bbe2171 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -515,14 +515,6 @@ void parsemessages(int cn, dynent *d, ucharbuf &p)
             break;
         };
         
-        case SV_FLAGPICKUP:
-        {
-            int flag = getint(p);
-            if(flag<0||flag>1) return;
-            flaginfos[flag].state=CTFF_STOLEN;
-            break;
-        };
-        
         // Added by Rick: Bot specific messages
         case SV_BOTSOUND:
         {
diff --git a/source/src/savegamedemo.cpp b/source/src/savegamedemo.cpp
index ed0c7504..231e74f1 100644
--- a/source/src/savegamedemo.cpp
+++ b/source/src/savegamedemo.cpp
@@ -336,10 +336,10 @@ void demoplaybackstep()
 
 void stopn() { if(demoplayback) stopreset(); else stop(); conoutf("demo stopped"); };
 
-// sorry :/
-/*COMMAND(record, ARG_1STR);
+
+COMMAND(record, ARG_1STR);
 COMMAND(demo, ARG_1STR);
-COMMANDN(stop, stopn, ARG_NONE);*/
+COMMANDN(stop, stopn, ARG_NONE);
 
 COMMAND(savegame, ARG_1STR);
 COMMAND(loadgame, ARG_1STR);
diff --git a/source/src/server.cpp b/source/src/server.cpp
index 9b3e1eed..c82b669f 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -947,7 +947,6 @@ void process(ENetPacket *packet, int sender, int chan)   // sender may be -1
 				f.lastupdate = lastsec;
                 sendflaginfo(flag, SV_FLAGPICKUP);
             };
-            QUEUE_MSG;
             break;
         };
         
diff --git a/source/vcpp/cube.suo b/source/vcpp/cube.suo
index b64f5d68..3ca6653c 100644
Binary files a/source/vcpp/cube.suo and b/source/vcpp/cube.suo differ