diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 86097822e..d4728315a 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1198,7 +1198,7 @@ static UINT8 P_GetModelSprite2(md2_t *md2, skin_t *skin, UINT8 spr2, player_t *p
 	if (!md2 || !skin)
 		return 0;
 
-	if ((spr2 & ~FF_SPR2SUPER) >= free_spr2)
+	if ((unsigned)(spr2 & ~FF_SPR2SUPER) >= free_spr2)
 		return 0;
 
 	while (!(md2->model->spr2frames[spr2*2 + 1])
diff --git a/src/m_menu.c b/src/m_menu.c
index a3e986fdf..5147077e0 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1309,12 +1309,12 @@ static menuitem_t OP_SoundOptionsMenu[] =
 	{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 115}, // 56
 	{IT_STRING | IT_CVAR, NULL, "Reset Music Upon Dying", &cv_resetmusic, 125}, // 62
 
-#if defined(HAVE_OPENMPT) || defined(HAVE_MIXERX)
+#ifdef HAVE_MIXERX
 	{IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 143},
 #endif
 };
 
-#if defined(HAVE_OPENMPT) || defined(HAVE_MIXERX)
+#ifdef HAVE_MIXERX
 
 #ifdef HAVE_OPENMPT
 #define OPENMPT_MENUOFFSET 32
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 9f1b15d53..4126d0716 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -13715,4 +13715,4 @@ void A_ModuloToState(mobj_t *actor)
 	if ((modulothing % locvar1 == 0))
 		P_SetMobjState(actor, (locvar2));
 	modulothing++;
-}
\ No newline at end of file
+}
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 0bfb81f4e..ea998b445 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -2404,7 +2404,7 @@ static void P_NetArchiveThinkers(void)
 			}
 #endif // ESLOPE
 #ifdef PARANOIA
-			else if (th->function.acp1 != P_RemoveThinkerDelayed) // wait garbage collection
+			else if (th->function.acp1 != (actionf_p1)P_RemoveThinkerDelayed) // wait garbage collection
 				I_Error("unknown thinker type %p", th->function.acp1);
 #endif
 		}
diff --git a/src/p_spec.c b/src/p_spec.c
index 23ab04fc7..5e06a18a7 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -9265,4 +9265,4 @@ static void P_SpawnPushers(void)
 					Add_Pusher(p_downwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
 				break;
 		}
-}
\ No newline at end of file
+}
diff --git a/src/p_tick.c b/src/p_tick.c
index 5ec0fb048..7606510fe 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -197,7 +197,7 @@ void P_InitThinkers(void)
 void P_AddThinker(const thinklistnum_t n, thinker_t *thinker)
 {
 #ifdef PARANOIA
-	I_Assert(n >= 0 && n < NUM_THINKERLISTS);
+	I_Assert(n < NUM_THINKERLISTS);
 #endif
 
 	thlist[n].prev->next = thinker;
@@ -326,7 +326,7 @@ static inline void P_RunThinkers(void)
 		for (currentthinker = thlist[i].next; currentthinker != &thlist[i]; currentthinker = currentthinker->next)
 		{
 #ifdef PARANOIA
-			I_Assert(currentthinker->function.acp1 != NULL)
+			I_Assert(currentthinker->function.acp1 != NULL);
 #endif
 			currentthinker->function.acp1(currentthinker);
 		}
diff --git a/src/r_things.c b/src/r_things.c
index 645d10015..92f2b9460 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -2511,7 +2511,7 @@ UINT8 P_GetSkinSprite2(skin_t *skin, UINT8 spr2, player_t *player)
 	if (!skin)
 		return 0;
 
-	if ((spr2 & ~FF_SPR2SUPER) >= free_spr2)
+	if ((unsigned)(spr2 & ~FF_SPR2SUPER) >= free_spr2)
 		return 0;
 
 	while (!(skin->sprites[spr2].numframes)
diff --git a/src/s_sound.c b/src/s_sound.c
index 2c6faf041..1c6cd5ef1 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -2304,4 +2304,4 @@ void ModFilter_OnChange(void)
 	if (openmpt_mhandle)
 		openmpt_module_set_render_param(openmpt_mhandle, OPENMPT_MODULE_RENDER_INTERPOLATIONFILTER_LENGTH, cv_modfilter.value);
 }
-#endif
\ No newline at end of file
+#endif