diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp
index 2562d8e63..ad7a3f891 100644
--- a/src/d_dehacked.cpp
+++ b/src/d_dehacked.cpp
@@ -2694,7 +2694,6 @@ static bool LoadDehSupp ()
 			return false;
 		}
 		bool gotnames = false;
-		int i;
 
 
 		if (++DehUseCount > 1)
diff --git a/src/v_font.cpp b/src/v_font.cpp
index e1e5998ba..ccbe56c41 100644
--- a/src/v_font.cpp
+++ b/src/v_font.cpp
@@ -899,6 +899,8 @@ FFont::FFont (int lump)
 	FontName = NAME_None;
 	Cursor = '_';
 	noTranslate = false;
+	uint8_t pp = 0;
+	for (auto &p : PatchRemap) p = pp++;
 }
 
 //==========================================================================