diff --git a/source/common/audio/music/music.cpp b/source/common/audio/music/music.cpp
index 4266d2cd3..1b36041da 100644
--- a/source/common/audio/music/music.cpp
+++ b/source/common/audio/music/music.cpp
@@ -859,7 +859,7 @@ void S_StopMusic (bool force)
 
 CCMD (changemus)
 {
-	if (!nomusic)
+	if (MusicEnabled())
 	{
 		if (argv.argc() > 1)
 		{
diff --git a/source/common/fonts/v_font.cpp b/source/common/fonts/v_font.cpp
index 6b002b754..750bb5d95 100644
--- a/source/common/fonts/v_font.cpp
+++ b/source/common/fonts/v_font.cpp
@@ -681,13 +681,13 @@ void V_ApplyLuminosityTranslation(int translation, uint8_t* pixel, int size)
 		int index = clamp(lumadjust, 0, 255);
 		PalEntry newcol = remap[index];
 		// extend the range if we find colors outside what initial analysis provided.
-		if (gray < lum_min)
+		if (gray < lum_min && lum_min != 0)
 		{
 			newcol.r = newcol.r * gray / lum_min;
 			newcol.g = newcol.g * gray / lum_min;
 			newcol.b = newcol.b * gray / lum_min;
 		}
-		else if (gray > lum_max)
+		else if (gray > lum_max && lum_max != 0)
 		{
 			newcol.r = clamp(newcol.r * gray / lum_max, 0, 255);
 			newcol.g = clamp(newcol.g * gray / lum_max, 0, 255);
diff --git a/source/common/platform/posix/sdl/i_system.cpp b/source/common/platform/posix/sdl/i_system.cpp
index b2f0d8436..03b96b8c3 100644
--- a/source/common/platform/posix/sdl/i_system.cpp
+++ b/source/common/platform/posix/sdl/i_system.cpp
@@ -90,7 +90,7 @@ void Mac_I_FatalError(const char* errortext);
 void Unix_I_FatalError(const char* errortext)
 {
 	// Close window or exit fullscreen and release mouse capture
-	SDL_Quit();
+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
 
 	const char *str;
 	if((str=getenv("KDE_FULL_SESSION")) && strcmp(str, "true") == 0)