diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index db1fc8f9b..6672f995e 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -4639,10 +4639,10 @@ static void Command_ListWADS_f(void)
 		nameonly(tempname = va("%s", wadfiles[i]->filename));
 		if (!i)
 			CONS_Printf("\x82 IWAD\x80: %s\n", tempname);
-		else if (i <= mainwads)
+		else if (i < mainwads)
 			CONS_Printf("\x82 * %.2d\x80: %s\n", i, tempname);
 		else if (!wadfiles[i]->important)
-			CONS_Printf("\x86 %c %.2d: %s\n", ((i <= mainwads + musicwads) ? '*' : ' '), i, tempname);
+			CONS_Printf("\x86 %c %.2d: %s\n", ((i < mainwads + musicwads) ? '*' : ' '), i, tempname);
 		else
 			CONS_Printf("   %.2d: %s\n", i, tempname);
 	}
diff --git a/src/d_netfil.c b/src/d_netfil.c
index f1e7e31dc..58587db10 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -163,10 +163,10 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
 #ifdef DEVELOP
 	i = 0;
 #else
-	i = mainwads + 1;
+	i = mainwads + musicwads;
 #endif
 
-	for (; i < numwadfiles; i++) //mainwads+1, otherwise we start on the first mainwad
+	for (; i < numwadfiles; i++) //mainwads+musicwads, otherwise we start on the first mainwad
 	{
 		// If it has only music/sound lumps, don't put it in the list
 		if (!wadfiles[i]->important)
@@ -197,7 +197,7 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
 
 		/* don't send mainwads!! */
 #ifdef DEVELOP
-		if (i <= mainwads)
+		if (i < mainwads)
 			filestatus += (2 << 4);
 #endif
 
@@ -565,7 +565,7 @@ INT32 CL_CheckFiles(void)
 #ifdef DEVELOP
 		j = 0;
 #else
-		j = mainwads + 1;
+		j = mainwads + musicwads;
 #endif
 		for (i = 0; i < fileneedednum || j < numwadfiles;)
 		{
diff --git a/src/r_textures.cpp b/src/r_textures.cpp
index f582f50d4..57ca9303c 100644
--- a/src/r_textures.cpp
+++ b/src/r_textures.cpp
@@ -1293,7 +1293,7 @@ Rloadtextures (INT32 i, INT32 w)
 			}
 
 			INT32 sizeLimit = 2048;
-			if (w <= mainwads)
+			if (w < mainwads)
 			{
 				// TODO: we ran out of time to do this properly.
 				// 4096 limit on textures may be incompatible with some older graphics cards (circa 2005-2008?).