diff --git a/source/src/physics.cpp b/source/src/physics.cpp
index 8d668313..a3f9c2e6 100644
--- a/source/src/physics.cpp
+++ b/source/src/physics.cpp
@@ -801,7 +801,7 @@ void tsens(int x)
                 sensl=sensn/2.0f;
             }
         }
-        conoutf("--- \f0you choose: %s sens",x==SDLK_3?"high":"low");
+        conoutf("--- \f0you choose: the %s sens",x==SDLK_3?"higher":"lower");
         testsens=sensn;
     }
     if (x == SDLK_2)
@@ -827,7 +827,7 @@ void tsens(int x)
             conoutf("--- \f0Sensitivity Training Ended. happy fragging.");
             sensitivity=sensn;
         } else {
-            conoutf("--- \f0Sensitivity Training Stopped. ");
+            conoutf("--- \f0Sensitivity Training Stopped.");
         }
         highlock=lowlock=0;
         sensn=sensl=sensh=0;
@@ -861,13 +861,13 @@ void mousemove(int odx, int ody)
 
     float cursens = sensitivity;
     if(senst) {cursens=testsens;}
-    if(mouseaccel && curtime && (dx || dy)) cursens += 0.02 * mouseaccel * sqrtf(dx*dx + dy*dy)/curtime;
+    if(mouseaccel && curtime && (dx || dy)) cursens += 0.02f * mouseaccel * sqrtf(dx*dx + dy*dy)/curtime;
     cursens /= 33.0f*sensitivityscale;
 
     if( zooming(player1) )
     {
         extern float fov; extern int scopefov;
-        cursens *= autoscopesens ? (((float)scopefov)/fov) : scopesensscale;
+        cursens *= autoscopesens ? ((float)scopefov*0.66f/fov) : scopesensscale;
     }
 
     camera1->yaw += dx*cursens;
diff --git a/source/src/server.cpp b/source/src/server.cpp
index c7bf4b7e..350c0936 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -1355,6 +1355,7 @@ void checkitemspawns(int diff)
 void serverdamage(client *target, client *actor, int damage, int gun, bool gib, const vec &hitpush = vec(0, 0, 0))
 {
     if (!m_demo && !m_coop && !validdamage(target, actor, damage, gun, gib)) return;
+    if ( m_arena && gun == GUN_GRENADE && arenaroundstartmillis + 2000 > gamemillis && target != actor ) return;
     clientstate &ts = target->state;
     ts.dodamage(damage);
     actor->state.damage += damage != 1000 ? damage : 0;
@@ -1857,6 +1858,7 @@ void startgame(const char *newname, int newmode, int newtime, bool notify)
         }
         mapbuffer.setrevision();
         logline(ACLOG_INFO, "Map height density information for %s: H = %.2f V = %d, A = %d and MA = %d", smapname, Mheight, Mvolume, Marea, Mopen);
+        items_blocked = false;
     }
     else if(isdedicated) sendservmsg("\f3server error: map not found - please start another map or send this map to the server");
     if(notify)
@@ -2656,7 +2658,7 @@ void process(ENetPacket *packet, int sender, int chan)
                 /* spam filter */
                 if ( servmillis > cl->mute ) // client is not muted
                 {
-                    if( s < S_AFFIRMATIVE || s > S_NICESHOT ) cl->mute = servmillis + 10000; // vc is invalid
+                    if( s < S_AFFIRMATIVE || s > S_AWESOME ) cl->mute = servmillis + 10000; // vc is invalid
                     else if ( cl->lastvc + 4000 < servmillis ) { if ( cl->spam > 0 ) cl->spam -= (servmillis - cl->lastvc) / 4000; } // no vc in the last 4 seconds
                     else cl->spam++; // the guy is spamming
                     if ( cl->spam < 0 ) cl->spam = 0;
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index e2cb8fc8..0c2c989f 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -612,7 +612,7 @@ bool weapon::reload()
     return true;
 }
 
-VAR(oldfashionedgunstats, 0, 0, 1);
+VARP(oldfashionedgunstats, 0, 0, 1);
 
 void weapon::renderstats()
 {