diff --git a/code/null/null_client.c b/code/null/null_client.c
index df327471..a3f8490d 100644
--- a/code/null/null_client.c
+++ b/code/null/null_client.c
@@ -120,3 +120,7 @@ void Key_GetKeysForCommand( const char *command, int *key1, int *key2 ) {
 
 void SCR_DebugGraph( float value, int color ) {
 }
+
+qboolean CL_FinishedIntro( void ) {
+	return qtrue;
+}
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index e79cd022..3cd59bfc 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -460,7 +460,7 @@ void SV_ChangeMaxClients( void ) {
 
 	// get the highest client number in use
 	count = 0;
-	for ( i = 0 ; i < sv_maxclients->integer ; i++ ) {
+	for ( i = 0 ; i < svs.iNumClients ; i++ ) {
 		if ( svs.clients[i].state >= CS_CONNECTED ) {
 			if (i > count)
 				count = i;