diff --git a/src/am_map.cpp b/src/am_map.cpp
index d84da2ebd..58082a7bf 100644
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@@ -2645,7 +2645,7 @@ void AM_drawPlayers ()
 		pt.y = pos.Y;
 		if (am_rotate == 1 || (am_rotate == 2 && viewactive))
 		{
-			angle = 90.;
+			angle = -90.;
 			AM_rotatePoint (&pt.x, &pt.y);
 		}
 		else
@@ -2806,7 +2806,7 @@ void AM_drawThings ()
 						if (frame->Texture[0] != frame->Texture[1]) angle += 180. / 16;
 						if (am_rotate == 1 || (am_rotate == 2 && viewactive))
 						{
-							angle += players[consoleplayer].camera->Angles.Yaw - 90.;
+							angle += players[consoleplayer].camera->Angles.Yaw + 90.;
 						}
 						rotation = int((angle.Normalized360() * (16. / 360.)).Degrees);
 
@@ -2830,7 +2830,7 @@ void AM_drawThings ()
 					if (am_rotate == 1 || (am_rotate == 2 && viewactive))
 					{
 						AM_rotatePoint (&p.x, &p.y);
-						angle += -players[consoleplayer].camera->Angles.Yaw + 90.;
+						angle += -players[consoleplayer].camera->Angles.Yaw - 90.;
 					}
 
 					color = AMColors[AMColors.ThingColor];
diff --git a/src/p_effect.cpp b/src/p_effect.cpp
index 249ba80f9..422fec6f1 100644
--- a/src/p_effect.cpp
+++ b/src/p_effect.cpp
@@ -587,7 +587,7 @@ void P_DrawSplash2 (int count, const DVector3 &pos, DAngle angle, int updown, in
 		break;
 	}
 
-	zvel = -0.5;
+	zvel = -1./512.;
 	zspread = updown ? -6000 / 65536. : 6000 / 65536.;
 	zadd = (updown == 2) ? 128 : 0;
 
diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index c7395208e..89ca3a799 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -1314,7 +1314,7 @@ void P_LoadSegs (MapData * map)
 			// errors _can_ cause firelines.
 
 			DAngle ptp_angle = (li->v2->fPos() - li->v1->fPos()).Angle();
-			DAngle seg_angle = AngleToFloat(segangle);
+			DAngle seg_angle = AngleToFloat(segangle << 16);
 			DAngle delta_angle = absangle(ptp_angle, seg_angle);
 
 			if (delta_angle >= 1.)