diff --git a/polymer/eduke32/source/jmact/control.c b/polymer/eduke32/source/jmact/control.c
index b53ae09d1..16e3a57dd 100644
--- a/polymer/eduke32/source/jmact/control.c
+++ b/polymer/eduke32/source/jmact/control.c
@@ -72,8 +72,8 @@ void CONTROL_GetMouseDelta(void)
 	*x = (*x * 32 * CONTROL_MouseSensitivity) >> 15;
 	*/
 
-	CONTROL_MouseAxes[0].analog = mulscale8(x, CONTROL_MouseSensitivity);
-	CONTROL_MouseAxes[1].analog = mulscale6(y, CONTROL_MouseSensitivity);
+    CONTROL_MouseAxes[0].analog = (x * CONTROL_MouseSensitivity>>8);
+    CONTROL_MouseAxes[1].analog = (y * CONTROL_MouseSensitivity>>6);
 }
 
 int32 CONTROL_GetMouseSensitivity(void)
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 2d89cd082..15ced25d5 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -2871,7 +2871,7 @@ cheat_for_port_credits:
         {
             short sense;
             sense = CONTROL_GetMouseSensitivity()>>10;
-            barsm(248,128,&sense,4,x==(MAXMOUSEBUTTONS-2)*2+2,MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2),PHX(-7));
+            barsm(248,128,&sense,2,x==(MAXMOUSEBUTTONS-2)*2+2,MENUHIGHLIGHT((MAXMOUSEBUTTONS-2)*2+2),PHX(-7));
             CONTROL_SetMouseSensitivity( sense<<10 );
         }
 
diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index 3dc16cc21..bb8bb195b 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -2706,7 +2706,7 @@ void getinput(short snum)
 
     info.dx += lastinfo.dx;
     info.dy += lastinfo.dy;
-    info.dz += lastinfo.dz;
+/*    info.dz += lastinfo.dz; */
     info.dyaw   += lastinfo.dyaw;
     info.dpitch += lastinfo.dpitch;
     info.droll  += lastinfo.droll;
@@ -2748,7 +2748,7 @@ void getinput(short snum)
     }
 
     if(BUTTON(gamefunc_Jump))
-        jump_input = 4;
+        jump_input = 2;
 
     loc.bits =   jump_input?1:0; //BUTTON(gamefunc_Jump);
     loc.bits |=   BUTTON(gamefunc_Crouch)<<1;
@@ -2836,11 +2836,13 @@ void getinput(short snum)
 
     if( myaimmode )
     {
-        lastinfo.dz = info.dz % (314-128);
         if(ud.mouseflip)
-            horiz -= info.dz/(314-128);
-        else horiz += info.dz/(314-128);
+            horiz = -(info.dz+lastinfo.dz)/(314-128);
+        else horiz = (info.dz+lastinfo.dz)/(314-128);
 
+        if(horiz > -1)
+            horiz++;
+        lastinfo.dz = (lastinfo.dz+info.dz) % (314-128);
         info.dz = 0;
     } else {
         lastinfo.dz = info.dz % (1<<6);