diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index ddd98c928..fd9f56af9 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -2755,11 +2755,16 @@ static int lib_sMusicExists(lua_State *L)
 		music_compat_name[6] = 0;
 		music_name = (const char *)&music_compat_name;
 	}
-
-	if (!player || P_IsLocalPlayer(player))
-		lua_pushinteger(L, (int)S_GetMusicLength());
 	else
-		lua_pushnil(L);
+	{
+		music_num = 0;
+		music_name = luaL_checkstring(L, 1);
+	}
+#else
+	const char *music_name = luaL_checkstring(L, 1);
+#endif
+	NOHUD
+	lua_pushboolean(L, S_MusicExists(music_name, checkMIDI, checkDigi));
 	return 1;
 }
 
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 8753fb22f..cd0ff4516 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -2840,7 +2840,6 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
 		mobj->modeltilt = mobj->standingslope;
 #endif
 	}
-#endif
 	if (diff2 & MD2_COLORIZED)
 		mobj->colorized = READUINT8(save_p);
 	if (diff2 & MD2_MIRRORED)
diff --git a/src/s_sound.c b/src/s_sound.c
index 81cda94b1..f03ad1fdf 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -88,7 +88,6 @@ consvar_t cv_midimusicvolume = {"midimusicvolume", "18", CV_SAVE, soundvolume_co
 
 // number of channels available
 consvar_t cv_numChannels = {"snd_channels", "64", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
-#endif
 
 consvar_t surround = {"surround", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 28bd4f891..37d5e37c6 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -887,6 +887,7 @@ void ST_Drawer(void)
 
 		V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2 + 15, V_HUDTRANSHALF|c, player_names[seenplayer-players]);
 	}
+#endif
 
 	// Doom's status bar only updated if necessary.
 	// However, ours updates every frame regardless, so the "refresh" param was removed