diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index a7d2de7a6..b1f8dd0a6 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -4060,7 +4060,7 @@ const char *name3, uint8_t *key3, UINT16 *pwr3,
 const char *name4, uint8_t *key4, UINT16 *pwr4)
 {
 	INT32 n, newplayernum, i;
-	UINT8 buf[4 + MAXPLAYERNAME + PUBKEYLENGTH + MAXAVAILABILITY];
+	UINT8 buf[4 + MAXPLAYERNAME + PUBKEYLENGTH + MAXAVAILABILITY + sizeof(((serverplayer_t *)0)->powerlevels)];
 	UINT8 *buf_p = buf;
 	boolean newplayer = false;
 
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 12afcc5f5..104b84779 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -5299,7 +5299,7 @@ static void P_NetArchiveMisc(savebuffer_t *save, boolean resending)
 	WRITEUINT32(save->p, cht_debug);
 }
 
-static inline boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading)
+static boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading)
 {
 	size_t i, j;
 	size_t numTasks;