diff --git a/src/p_user.c b/src/p_user.c
index 47077615c..d07b71390 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -7503,11 +7503,13 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 	}
 	pitch = thiscam->pitch + (angle_t)FixedMul(pitch - thiscam->pitch, camspeed/4);
 
-	if (rendermode == render_opengl)
+	if (rendermode == render_opengl && !cv_grshearing.value)
 		distxy = FixedMul(dist, FINECOSINE((pitch>>ANGLETOFINESHIFT) & FINEMASK));
 	else
 		distxy = dist;
 	distz = -FixedMul(dist, FINESINE((pitch>>ANGLETOFINESHIFT) & FINEMASK));
+	if (splitscreen == 1) // 2 player is weird, this helps keep players on screen
+		distz = 3*distz/5;
 
 	x = mo->x - FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), distxy);
 	y = mo->y - FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), distxy);
diff --git a/src/r_main.c b/src/r_main.c
index a4fa9d463..5967e6c9d 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -833,7 +833,7 @@ static void R_SetupFreelook(void)
 		// clip it in the case we are looking a hardware 90 degrees full aiming
 		// (lmps, network and use F12...)
 		G_SoftwareClipAimingPitch((INT32 *)&aimingangle);
-		dy = AIMINGTODY(aimingangle) * viewwidth/BASEVIDWIDTH;
+		dy = AIMINGTODY(aimingangle) * viewheight/BASEVIDHEIGHT;
 		yslope = &yslopetab[viewheight*8 - (viewheight/2 + dy)];
 	}
 	centery = (viewheight/2) + dy;