diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index b34ddfc01..70a257c92 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -428,7 +428,7 @@ static md2_model_t *md2_readModel(const char *filename)
 							spr2 |= FF_SPR2SUPER;
 						if (model->spr2frames[spr2*2 + 1]++ == 0) // numspr2frames
 							model->spr2frames[spr2*2] = i; // starting frame
-						CONS_Debug(DBG_RENDER, "frame %s, sprite2 %s - starting frame %d, number of frames %d\n", frame->name, spr2names[spr2 & ~FF_SPR2SUPER], model->spr2frames[spr2*2], model->spr2frames[spr2*2 + 1]);
+						CONS_Debug(DBG_RENDER, "frame %s, sprite2 %s - starting frame %s, number of frames %s\n", frame->name, spr2names[spr2 & ~FF_SPR2SUPER], sizeu1(model->spr2frames[spr2*2]), sizeu2(model->spr2frames[spr2*2 + 1]));
 					}
 				}
 			}
diff --git a/src/lua_infolib.c b/src/lua_infolib.c
index c3803f7e2..48ac57c32 100644
--- a/src/lua_infolib.c
+++ b/src/lua_infolib.c
@@ -165,10 +165,12 @@ static int lib_setSpr2default(lua_State *L)
 	{
 		const char *name = lua_tostring(L, 1);
 		for (i = 0; i < free_spr2; i++)
+		{
 			if (fastcmp(name, spr2names[i]))
 				break;
-			if (i == free_spr2)
-				return luaL_error(L, "spr2defaults[] invalid index");
+		}
+		if (i == free_spr2)
+			return luaL_error(L, "spr2defaults[] invalid index");
 	}
 	else
 		return luaL_error(L, "spr2defaults[] invalid index");
@@ -182,10 +184,12 @@ static int lib_setSpr2default(lua_State *L)
 	{
 		const char *name = lua_tostring(L, 2);
 		for (j = 0; j < free_spr2; j++)
+		{
 			if (fastcmp(name, spr2names[j]))
 				break;
-			if (j == free_spr2)
-				return luaL_error(L, "spr2defaults[] invalid index");
+		}
+		if (j == free_spr2)
+			return luaL_error(L, "spr2defaults[] invalid index");
 	}
 
 	if (j >= free_spr2)
diff --git a/src/m_menu.c b/src/m_menu.c
index 5bc5a0b0b..8afee97f7 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -8719,6 +8719,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				COM_BufAddText (va("%s %s\n",setupm_cvdefaultname->name,setupm_name));
 				break;
 			}
+			/* FALLTHRU */
 		case KEY_RIGHTARROW:
 			if (itemOn == 1)       //player skin
 			{
diff --git a/src/p_mobj.c b/src/p_mobj.c
index ac47ba686..10bdee2bc 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6781,6 +6781,7 @@ void P_MobjThinker(mobj_t *mobj)
 					whoosh->momz = mobj->target->momz; // Stay reasonably centered for a few frames
 					mobj->target->player->pflags &= ~PF_SHIELDABILITY; // prevent eternal whoosh
 				}
+				/* FALLTHRU */
 			case MT_FLAMEAURA_ORB:
 				if (!(mobj->flags2 & MF2_SHIELD))
 					return;
@@ -7268,7 +7269,7 @@ void P_MobjThinker(mobj_t *mobj)
 			break;
 		case MT_AQUABUZZ:
 			P_MobjCheckWater(mobj); // solely for MFE_UNDERWATER for A_FlickySpawn
-			// no break here on purpose
+			/* FALLTHRU */
 		case MT_BIGAIRMINE:
 			{
 				if (mobj->tracer && mobj->tracer->player && mobj->tracer->health > 0
@@ -7752,6 +7753,7 @@ void P_MobjThinker(mobj_t *mobj)
 				else
 					mobj->z = mobj->floorz;
 			}
+			/* FALLTHRU */
 		default:
 			// check mobj against possible water content, before movement code
 			P_MobjCheckWater(mobj);
@@ -11311,4 +11313,4 @@ mobj_t *P_SpawnMobjFromMobj(mobj_t *mobj, fixed_t xofs, fixed_t yofs, fixed_t zo
 	newmobj->destscale = mobj->destscale;
 	P_SetScale(newmobj, mobj->scale);
 	return newmobj;
-}
\ No newline at end of file
+}
diff --git a/src/p_user.c b/src/p_user.c
index 60d4cd5b7..5de9aa17b 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -9773,6 +9773,7 @@ void P_PlayerThink(player_t *player)
 						player->drawangle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
 						break;
 					}
+					/* FALLTHRU */
 				default:
 					player->drawangle = player->mo->angle;
 					break;