diff --git a/engine/server/progs.h b/engine/server/progs.h
index e01160273..a072c330f 100644
--- a/engine/server/progs.h
+++ b/engine/server/progs.h
@@ -80,13 +80,7 @@ typedef struct edict_s
 
 	/*these are shared with csqc*/
 	link_t	area;
-	int			num_leafs;
-	short		leafnums[MAX_ENT_LEAFS];
-#ifdef Q2BSPS
-	int areanum;
-	int areanum2;
-	int headnode;
-#endif
+	pvscache_t pvsinfo;
 #ifdef USEODE
 	entityode_t ode;
 #endif
diff --git a/engine/server/sv_user.c b/engine/server/sv_user.c
index d516fd926..4c3c3059e 100644
--- a/engine/server/sv_user.c
+++ b/engine/server/sv_user.c
@@ -3471,7 +3471,7 @@ void SV_PTrack_f (void)
 	}
 #endif
 
-	if (i < 0 || i >= MAX_CLIENTS || svs.clients[i].state != cs_spawned ||
+	if (i < 0 || i >= sv.allocated_client_slots || svs.clients[i].state != cs_spawned ||
 		svs.clients[i].spectator)
 	{
 		SV_ClientTPrintf (host_client, PRINT_HIGH, STL_INVALIDTRACKCLIENT);