diff --git a/src/g_demo.c b/src/g_demo.c
index 2c455e71d..f1c1b35bf 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -875,7 +875,7 @@ void G_ConsAllGhostTics(void)
 void G_ConsGhostTic(INT32 playernum)
 {
 	UINT8 ziptic;
-	UINT32 px,py,pz,gx,gy,gz;
+	INT32 px,py,pz,gx,gy,gz;
 	mobj_t *testmo;
 	UINT32 syncleeway;
 
diff --git a/src/m_menu.c b/src/m_menu.c
index 31766bec5..fb8059c3d 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -5529,7 +5529,7 @@ static void DrawReplayHutReplayInfo(void)
 
 	case MD_OUTDATED:
 		V_DrawThinString(17, 64, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT|highlightflags, "Recorded on an outdated version.");
-		/*fallthru*/
+		/* FALLTHRU */
 	default:
 		// Draw level stuff
 		x = 15; y = 15;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 2a5d817c4..26a185b12 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -5813,7 +5813,7 @@ static boolean P_MobjDeadThink(mobj_t *mobj)
 			P_RemoveMobj(mobj);
 			return false;
 		}
-		// fallthru
+		/* FALLTHRU */
 	case MT_ORBINAUT_SHIELD:
 	case MT_BANANA_SHIELD:
 	case MT_EGGMANITEM_SHIELD:
@@ -5823,7 +5823,7 @@ static boolean P_MobjDeadThink(mobj_t *mobj)
 	case MT_JAWZ_DUD:
 		if (P_IsObjectOnGround(mobj))
 			P_SetMobjState(mobj, mobj->info->xdeathstate);
-		// fallthru
+		/* FALLTHRU */
 	case MT_JAWZ_SHIELD:
 		mobj->drawflags ^= MFD_DONTDRAW;
 		break;
@@ -8191,6 +8191,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
 				cur = cur->hnext;
 			}
 		}
+		break;
 	case MT_RANDOMITEM:
 		if (gametype == GT_BATTLE && mobj->threshold == 70)
 		{