diff --git a/src/dehacked.c b/src/dehacked.c
index b9a28310d..92d548ea5 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -5195,8 +5195,10 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
 			deh_warning("No word in this line: %s", s);
 	} // end while
 
-	/*if (gamedataadded) -- REFRESHDIR_GAMEDATA murdered this
-		G_LoadGameData();*/
+	/* REFRESHDIR_GAMEDATA murdered this
+	if (gamedataadded)
+		G_LoadGameData();
+	*/
 
 	if (gamestate == GS_TITLESCREEN)
 	{
diff --git a/src/w_wad.c b/src/w_wad.c
index bf96eb58c..cad9da5e8 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -713,7 +713,6 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
 #ifndef NOMD5
 	size_t i;
 #endif
-	size_t packetsize;
 	UINT8 md5sum[16];
 	boolean important;
 
@@ -886,7 +885,7 @@ INT32 W_InitMultipleFiles(char **filenames, boolean addons)
 			G_SetGameModified(true, false);
 
 		//CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames);
-		rc &= (W_InitFile(*filenames, numwadfiles < mainfiles, true) != INT16_MAX) ? 1 : 0;
+		rc &= (W_InitFile(*filenames, !addons, true) != INT16_MAX) ? 1 : 0;
 	}
 
 	if (!numwadfiles)
diff --git a/src/w_wad.h b/src/w_wad.h
index 769779497..b1d3b55c3 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -153,7 +153,7 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup);
 // W_InitMultipleFiles returns 1 if all is okay, 0 otherwise,
 // so that it stops with a message if a file was not found, but not if all is okay.
 // W_InitMultipleFiles exits if a file was not found, but not if all is okay.
-INT32 W_InitMultipleFiles(char **filenames, UINT16 mainfiles);
+INT32 W_InitMultipleFiles(char **filenames, boolean addons);
 
 const char *W_CheckNameForNumPwad(UINT16 wad, UINT16 lump);
 const char *W_CheckNameForNum(lumpnum_t lumpnum);