diff --git a/src/doomdef.h b/src/doomdef.h
index 0de781c6..070130cb 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -227,7 +227,7 @@ extern char  logfilename[1024];
 // NOTE: it needs more than this to increase the number of players...
 
 #define MAXPLAYERS 16
-#define MAXSKINS 128
+#define MAXSKINS 255
 #define PLAYERSMASK (MAXPLAYERS-1)
 #define MAXPLAYERNAME 21
 
diff --git a/src/m_menu.c b/src/m_menu.c
index 3243e0fc..f98f917e 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -2381,7 +2381,7 @@ static void M_ChangeCvar(INT32 choice)
 	{
 		if (cv == &cv_playercolor)
 		{
-			SINT8 skinno = R_SkinAvailable(cv_chooseskin.string);
+			INT32 skinno = R_SkinAvailable(cv_chooseskin.string);
 			if (skinno != -1)
 				CV_SetValue(cv,skins[skinno].prefcolor);
 			return;
diff --git a/src/w_wad.h b/src/w_wad.h
index ffe63e79..3ec33a30 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -77,9 +77,10 @@ typedef struct
 // =========================================================================
 
 #define MAX_WADPATH 512
-#define MAX_WADFILES 127 // maximum of wad files used at the same time
-// Replay code relies on it being an UINT8 and, just to be safe, in case some wad counter somewhere is a SINT8, you should NOT go above 127 here if you're lazy like me.
-// Besides, are there truly 127 wads worth your interrest?
+#define MAX_WADFILES 255 // maximum of wad files used at the same time
+// Replay code relies on it being an UINT8. There are no SINT8s handling WAD indices, though.
+// Can be set all the way up to 255 but not 256,
+// because an UINT8 will never be >= 256, probably breaking some conditionals.
 
 #define lumpcache_t void *