diff --git a/src/d_main.c b/src/d_main.c
index 9b34ed9415c9edf0015c787126338d6a9495929c..23835136ac0c3867a23a7e2c6bf8d5ee514c5e6f 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1235,7 +1235,7 @@ void D_SRB2Main(void)
 	else
 	{
 		if (M_CheckParm("-nomidimusic"))
-			midi_disabled = true; ; // WARNING: DOS version initmusic in I_StartupSound
+			midi_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
 		if (M_CheckParm("-nodigmusic"))
 			digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
 	}
diff --git a/src/s_sound.c b/src/s_sound.c
index 6c1e3f2cb0ad97bfd418b4996e849ede62d38cef..2ecd4725480f878d84a9eedecf0c6dd084f55fa3 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1613,6 +1613,9 @@ static void Command_RestartAudio_f(void)
 
 void GameSounds_OnChange(void)
 {
+	if (M_CheckParm("-nosound"))
+		return;
+
 	if (sound_disabled)
 	{
 		sound_disabled = false;
@@ -1628,6 +1631,11 @@ void GameSounds_OnChange(void)
 
 void GameDigiMusic_OnChange(void)
 {
+	if (M_CheckParm("-nomusic"))
+		return;
+	else if (M_CheckParm("-nodigmusic"))
+		return;
+
 	if (digital_disabled)
 	{
 		digital_disabled = false;
@@ -1665,6 +1673,11 @@ void GameDigiMusic_OnChange(void)
 
 void GameMIDIMusic_OnChange(void)
 {
+	if (M_CheckParm("-nomusic"))
+		return;
+	else if (M_CheckParm("-nomidimusic"))
+		return;
+
 	if (midi_disabled)
 	{
 		midi_disabled = false;
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 2b35ce8b8a044c824b6f825a117d5ae1cf9703dc..e7cb28f2d580f21f12f33c8c63fa6fdc8aed1cb5 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -2076,8 +2076,11 @@ void I_StartupTimer(void)
 
 void I_Sleep(void)
 {
-	if (cv_sleep.value != -1)
-		SDL_Delay(cv_sleep.value);
+	if (dedicated)
+		SDL_Delay(15);
+	else
+		if (cv_sleep.value != -1)
+			SDL_Delay(cv_sleep.value);
 }
 
 INT32 I_StartupSystem(void)