diff --git a/src/am_map.cpp b/src/am_map.cpp
index d00b4fb75..93682dee1 100644
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@@ -2671,14 +2671,15 @@ void DAutomap::rotatePoint (double *x, double *y)
 
 void DAutomap::drawLineCharacter(const mline_t *lineguy, size_t lineguylines, double scale, DAngle angle, const AMColor &color, double x, double y)
 {
-	int		i;
 	mline_t	l;
 
-	for (i=0;i<lineguylines;i++) {
+	for (size_t i=0;i<lineguylines;i++)
+	{
 		l.a.x = lineguy[i].a.x;
 		l.a.y = lineguy[i].a.y;
 
-		if (scale) {
+		if (scale)
+		{
 			l.a.x *= scale;
 			l.a.y *= scale;
 		}
@@ -2692,7 +2693,8 @@ void DAutomap::drawLineCharacter(const mline_t *lineguy, size_t lineguylines, do
 		l.b.x = lineguy[i].b.x;
 		l.b.y = lineguy[i].b.y;
 
-		if (scale) {
+		if (scale)
+		{
 			l.b.x *= scale;
 			l.b.y *= scale;
 		}
diff --git a/src/g_level.cpp b/src/g_level.cpp
index c619ec76f..581ff9b34 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -1464,7 +1464,7 @@ void FLevelLocals::Init()
 
 	gravity = sv_gravity * 35/TICRATE;
 	aircontrol = sv_aircontrol;
-	teamdamage = teamdamage;
+	teamdamage = ::teamdamage;
 	flags = 0;
 	flags2 = 0;
 	flags3 = 0;
diff --git a/src/umapinfo.cpp b/src/umapinfo.cpp
index 324b1a0e1..6da8f3316 100644
--- a/src/umapinfo.cpp
+++ b/src/umapinfo.cpp
@@ -275,7 +275,7 @@ static int ParseStandardProperty(FScanner &scanner, UMapEntry *mape)
 			{
 				// This cannot be evaluated here because this needs to be done in the context of the level being used.
 				FSpecialAction & bossact = mape->BossActions[mape->BossActions.Reserve(1)];
-				bossact = { type, special | 0x40000000, tag };
+				bossact = { type, special | 0x40000000, {tag} };
 			};
 		}
 	}