diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc
index bb261029..f0081dd8 100644
--- a/scripts/zm/replaced/_zm.gsc
+++ b/scripts/zm/replaced/_zm.gsc
@@ -576,6 +576,7 @@ fade_out_intro_screen_zm( hold_black_time, fade_out_time, destroyed_afterwards )
 			players = get_players();
 			for ( i = 0; i < players.size; i++ )
     		{
+				players[i].waiting = 1;
 				players[i] freezecontrols( 1 );
 			}
 
@@ -594,7 +595,13 @@ fade_out_intro_screen_zm( hold_black_time, fade_out_time, destroyed_afterwards )
 			num_players = get_number_of_valid_players();
 		}
 
-		if ( is_gametype_active( "zgrief" ) && is_true( level.allow_teamchange ) )
+		players = get_players();
+		for ( i = 0; i < players.size; i++ )
+		{
+			players[i].waiting = undefined;
+		}
+
+		if ( is_gametype_active( "zgrief" ) )
 		{
 			ready_up_hud = createServerFontString( "objective", 1.5 );
 			ready_up_hud setPoint( "CENTER", "CENTER", 0, -120 );
@@ -604,7 +611,8 @@ fade_out_intro_screen_zm( hold_black_time, fade_out_time, destroyed_afterwards )
 			ready_up_hud setText( "PRESS ^3[{+gostand}]^7 OR ^3[{+activate}]^7 TO READY UP" );
 
 			num_ready = 0;
-			while ( num_ready < level.pregame_minplayers )
+			players = get_players();
+			while ( num_ready < players.size )
 			{
 				num_ready = 0;
 				players = get_players();
@@ -655,6 +663,7 @@ fade_out_intro_screen_zm( hold_black_time, fade_out_time, destroyed_afterwards )
     players = get_players();
     for ( i = 0; i < players.size; i++ )
     {
+		players[i].ready = undefined;
 		players[i].statusicon = "";
 
         if ( !( isdefined( level.host_ended_game ) && level.host_ended_game ) )
diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc
index 2a2c1ed9..3226207f 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -96,7 +96,7 @@ init()
 	level.player_suicide_func = ::player_suicide;
 
 	level thread grief_intro_msg();
-	level thread round_start_wait(15, true);
+	level thread round_start_wait(5, true);
 	level thread remove_round_number();
 	level thread unlimited_zombies();
 	level thread unlimited_powerups();