diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 98476fe50..eadff6726 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -84,7 +84,7 @@ static boolean serverrunning = false;
 INT32 serverplayer = 0;
 char motd[254], server_context[8]; // Message of the Day, Unique Context (even without Mumble support)
 
-int playerconsole[MAXPLAYERS];
+UINT8 playerconsole[MAXPLAYERS];
 
 // Server specific vars
 UINT8 playernode[MAXPLAYERS];
@@ -3491,7 +3491,7 @@ static inline void SV_AddNode(INT32 node)
 static void Got_AddPlayer(UINT8 **p, INT32 playernum)
 {
 	INT16 node, newplayernum;
-	int console;
+	UINT8 console;
 	UINT8 splitscreenplayer = 0;
 	UINT8 i;
 
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index fbd51ebd1..6814bacce 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -2006,12 +2006,10 @@ static void Got_PowerLevel(UINT8 **cp,INT32 playernum)
 
 static void Got_PartyInvite(UINT8 **cp,INT32 playernum)
 {
-	int invitee;
+	UINT8 invitee;
 
 	boolean kick = false;
 
-	invitee = READUINT8 (*cp);
-
 	if (
 			invitee >= 0 &&
 			invitee < MAXPLAYERS &&