diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 2e9e5726a..3a152562b 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -5731,7 +5731,7 @@ static void HWR_DrawSkyBackground(player_t *player)
 
 	dimensionmultiply = ((float)textures[texturetranslation[skytexture]]->width/256.0f);
 
-	v[0].sow = v[3].sow = ((float) (-angle) / ((ANGLE_90-1)*dimensionmultiply)); // left
+	v[0].sow = v[3].sow = (-1.0f * angle) / ((ANGLE_90-1)*dimensionmultiply); // left
 	v[2].sow = v[1].sow = v[0].sow + (1.0f/dimensionmultiply); // right (or left + 1.0f)
 	// use +angle and -1.0f above instead if you wanted old backwards behavior
 
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 473209350..79a52fe9f 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -571,7 +571,7 @@ void Command_Teleport_f(void)
 		}
 		else // scan the thinkers to find starposts...
 		{
-			mobj_t *mo2;
+			mobj_t *mo2 = NULL;
 			thinker_t *th;
 
 			INT32 starpostmax = 0;
diff --git a/src/p_map.c b/src/p_map.c
index 648bb2bcc..b4ace61c7 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -134,7 +134,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 {
 	fixed_t vertispeed = spring->info->mass;
 	fixed_t horizspeed = spring->info->damage;
-	boolean final;
+	boolean final = false;
 
 	// Object was already sprung this tic
 	if (object->eflags & MFE_SPRUNG)
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 6a07e513f..f0a8757c1 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -486,7 +486,7 @@ static UINT32 num_ffloors = 0; // for loading
 // But also check for equality and return the matching index
 static UINT32 CheckAddNetColormapToList(extracolormap_t *extra_colormap)
 {
-	extracolormap_t *exc, *exc_prev;
+	extracolormap_t *exc, *exc_prev = NULL;
 	UINT32 i = 0;
 
 	if (!net_colormaps)
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 66a5b73ef..986c2f48b 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1510,7 +1510,7 @@ static void ST_drawNiGHTSLink(void)
 	else
 		colornum = linkColor[mag][sel];
 
-	aflag |= ((stplyr->linktimer < nightslinktics/3)
+	aflag |= ((stplyr->linktimer < (UINT32)nightslinktics/3)
 	? (9 - 9*stplyr->linktimer/(nightslinktics/3)) << V_ALPHASHIFT
 	: 0);
 
@@ -1614,11 +1614,12 @@ static void ST_drawNiGHTSHUD(void)
 #endif
 	ST_DrawTopLeftOverlayPatch(16, 8, nbracket);
 	if (G_IsSpecialStage(gamemap))
-		ST_DrawTopLeftOverlayPatch(24, 16, (
 #ifdef MANIASPHERES
-			(stplyr->bonustime && (leveltime & 4)) ? nssbon :
+		ST_DrawTopLeftOverlayPatch(24, 16, (
+			(stplyr->bonustime && (leveltime & 4)) ? nssbon : nsshud));
+#else
+		ST_DrawTopLeftOverlayPatch(24, 16, (nsshud));
 #endif
-			nsshud));
 	else
 		ST_DrawTopLeftOverlayPatch(24, 16, *(((stplyr->bonustime) ? nbon : nhud)+((leveltime/2)%12)));
 
diff --git a/src/y_inter.c b/src/y_inter.c
index 29e611730..1a1675fdd 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -1909,8 +1909,8 @@ static void Y_AwardCoopBonuses(void)
 		}
 
 		ptlives = min(
-			((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((players[i].score/50000) - (oldscore/50000), 0) : 0),
-			(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives));
+			(INT32)((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((INT32)((players[i].score/50000) - (oldscore/50000)), (INT32)0) : 0),
+			(INT32)(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives));
 		if (ptlives)
 			P_GivePlayerLives(&players[i], ptlives);
 
@@ -1955,10 +1955,9 @@ static void Y_AwardSpecialStageBonus(void)
 
 		// grant extra lives right away since tally is faked
 		ptlives = min(
-			((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((players[i].score/50000) - (oldscore/50000), 0) : 0),
-			(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives));
-		if (ptlives)
-			P_GivePlayerLives(&players[i], ptlives);
+			(INT32)((!ultimatemode && !modeattacking && players[i].lives != INFLIVES) ? max((INT32)((players[i].score/50000) - (oldscore/50000)), (INT32)0) : 0),
+			(INT32)(mapheaderinfo[prevmap]->maxbonuslives < 0 ? INT32_MAX : mapheaderinfo[prevmap]->maxbonuslives));
+		P_GivePlayerLives(&players[i], ptlives);
 
 		if (i == consoleplayer)
 		{