diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 7302c727a8b334e6d17de2ef5d9528d534272d6d..2a02b1a2438fdf3affbf34e6b98a1a7a380d84d2 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -1243,6 +1243,9 @@ static int side_get(lua_State *L)
 		return 1;
 	case side_text:
 		{
+			boolean isfrontside;
+			size_t sidei = side-sides;
+
 			if (udmf)
 			{
 				LUA_Deprecated(L, "(sidedef_t).text", "(sidedef_t).line.stringargs");
@@ -1250,7 +1253,7 @@ static int side_get(lua_State *L)
 				return 1;
 			}
 
-			boolean isfrontside = side->line->sidenum[0] == side-sides;
+			isfrontside = side->line->sidenum[0] == sidei;
 
 			lua_pushstring(L, side->line->stringargs[isfrontside ? 0 : 1]);
 			return 1;
diff --git a/src/p_setup.c b/src/p_setup.c
index 733a47792a221e7c710ffe80eed57e795ceac7d4..effd2c3689af1f2c26cdd33301a37d1a9a5fe203 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -4005,7 +4005,7 @@ static void P_LinkMapData(void)
 		if (!seg->sidedef)
 			CorruptMapError(va("P_LinkMapData: seg->sidedef is NULL "
 				"(subsector %s, firstline is %d)", sizeu1(i), ss->firstline));
-		if (seg->sidedef - sides < 0 || seg->sidedef - sides > (UINT32)numsides)
+		if (seg->sidedef - sides < 0 || sidei > numsides)
 			CorruptMapError(va("P_LinkMapData: seg->sidedef refers to sidedef %s of %s "
 				"(subsector %s, firstline is %d)", sizeu1(sidei), sizeu2(numsides),
 				sizeu3(i), ss->firstline));