diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 256f5dfe1..36b474201 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -4495,7 +4495,7 @@ static void HandlePlayerInfo(SINT8 node)
 {
 	(void)node;
 	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
-	for (INT32 i = 0; i < MAXPLAYERS; i++)
+	for (INT32 i = 0; i < MSCOMPAT_MAXPLAYERS; i++)
 	{
 		playerinfo[i] = netbuffer->u.playerinfo[i];
 	}
diff --git a/src/doomdef.h b/src/doomdef.h
index eaa694e4e..84e5327de 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -207,7 +207,7 @@ extern char logfilename[1024];
 #define ENCOREFADECOLOR 209 // 122
 
 // Master Server compatibility ONLY
-#define MSCOMPAT_MAXPLAYERS (42)
+#define MSCOMPAT_MAXPLAYERS (32)
 
 // State updates, number of tics / second.
 // NOTE: used to setup the timer rate, see I_StartupTimer().
diff --git a/src/i_net.h b/src/i_net.h
index 1d85d860a..aeb2ffc69 100644
--- a/src/i_net.h
+++ b/src/i_net.h
@@ -22,10 +22,10 @@
 
 /// \def MAXPACKETLENGTH
 /// For use in a LAN
-#define MAXPACKETLENGTH 1450
+#define MAXPACKETLENGTH 2048
 /// \def INETPACKETLENGTH
 ///  For use on the internet
-#define INETPACKETLENGTH 1024
+#define INETPACKETLENGTH 1450
 
 #define NO_BAN_TIME (time_t)(-1)