diff --git a/source/blood/src/blood.cpp b/source/blood/src/blood.cpp
index 4f63a6e8d..f6ef5b086 100644
--- a/source/blood/src/blood.cpp
+++ b/source/blood/src/blood.cpp
@@ -387,7 +387,6 @@ static void PrecacheSounds(void)
 
 void PreloadCache(void)
 {
-    char tempbuf[128];
     if (gDemo.at1)
         return;
     PrecacheSounds();
diff --git a/source/common/menu/joystickmenu.cpp b/source/common/menu/joystickmenu.cpp
index 40b0a4136..bbdf92421 100644
--- a/source/common/menu/joystickmenu.cpp
+++ b/source/common/menu/joystickmenu.cpp
@@ -382,7 +382,7 @@ void UpdateJoystickMenu(IJoystickConfig *selected)
 			{
 				it = new FOptionMenuItemStaticText("$JOYMNU_DISABLED1");
 				opt->mItems.Push(it);
-				it = new FOptionMenuItemStaticText("$JOYMNU_DISABLED1");
+				it = new FOptionMenuItemStaticText("$JOYMNU_DISABLED2");
 				opt->mItems.Push(it);
 			}
 		}
diff --git a/source/common/utility/cmdlib.h b/source/common/utility/cmdlib.h
index 7af6c7859..56c1382eb 100644
--- a/source/common/utility/cmdlib.h
+++ b/source/common/utility/cmdlib.h
@@ -23,6 +23,7 @@ char(&_ArraySizeHelper(T(&array)[N]))[N];
 bool FileExists (const char *filename);
 bool DirExists(const char *filename);
 bool DirEntryExists (const char *pathname, bool *isdir = nullptr);
+bool GetFileInfo(const char* pathname, size_t* size, time_t* time);
 
 extern	FString progdir;
 
diff --git a/source/common/utility/configfile.h b/source/common/utility/configfile.h
index ab6866430..1e7bdc158 100644
--- a/source/common/utility/configfile.h
+++ b/source/common/utility/configfile.h
@@ -103,7 +103,7 @@ private:
 		//char Name[1];	// + length of name
 	};
 
-	FConfigSection *Sections;
+	FConfigSection* Sections = nullptr;
 	FConfigSection **LastSectionPtr;
 	FConfigSection *CurrentSection;
 	FConfigEntry *CurrentEntry;
diff --git a/wadsrc/static/engine/menudef.txt b/wadsrc/static/engine/menudef.txt
index 7ba613449..b9f5df125 100644
--- a/wadsrc/static/engine/menudef.txt
+++ b/wadsrc/static/engine/menudef.txt
@@ -1088,7 +1088,7 @@ OptionValue "AimMode"
 {
 	0, "$OPTVAL_NEVER"
 	1, "$OPTVAL_ALWAYS"
-	2, "$OPTRAL_HITSCAN"
+	2, "$OPTVAL_HITSCAN"
 }
 
 OptionValue "RunMode"