diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index 94cd70b4..8004f218 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -911,7 +911,7 @@ static void CL_CompleteDemoName( char *args, int argNum )
 		char demoExt[ 16 ];
 
 		Com_sprintf( demoExt, sizeof( demoExt ), ".dm_%d", PROTOCOL_VERSION );
-		Field_CompleteFilename( "demos", demoExt, qtrue, qfalse );
+		Field_CompleteFilename( "demos", demoExt, qtrue, qtrue );
 	}
 }
 
diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index ef851dd7..33c61bcd 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -350,7 +350,7 @@ static void SV_AddEntitiesVisibleFromPoint( vec3_t origin, clientSnapshot_t *fra
 		// entities can be flagged to be sent to a given mask of clients
 		if ( ent->r.svFlags & SVF_CLIENTMASK ) {
 			if (frame->ps.clientNum >= 32)
-				Com_Error( ERR_DROP, "SVF_CLIENTMASK: cientNum >= 32\n" );
+				Com_Error( ERR_DROP, "SVF_CLIENTMASK: clientNum >= 32\n" );
 			if (~ent->r.singleClient & (1 << frame->ps.clientNum))
 				continue;
 		}