diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp
index dd673ebe88..af8047a3d0 100644
--- a/src/d_iwad.cpp
+++ b/src/d_iwad.cpp
@@ -194,6 +194,12 @@ void FIWadManager::ParseIWadInfo(const char *fn, const char *data, int datasize,
 						iwad->StartupType = FStartupInfo::StrifeStartup;
 					else iwad->StartupType = FStartupInfo::DefaultStartup;
 				}
+				else if (sc.Compare("StartupSong"))
+				{
+					sc.MustGetStringName("=");
+					sc.MustGetString();
+					iwad->Song = sc.String;
+				}
 				else
 				{
 					sc.ScriptError("Unknown keyword '%s'", sc.String);
@@ -766,6 +772,7 @@ const FIWADInfo *FIWadManager::FindIWAD(TArray<FString> &wadfiles, const char *i
 		DoomStartupInfo.FgColor = iwad_info->FgColor;
 	}
 	if (DoomStartupInfo.Type == 0) DoomStartupInfo.Type = iwad_info->StartupType;
+	if (DoomStartupInfo.Song.IsEmpty()) DoomStartupInfo.Song = iwad_info->Song;
 	I_SetIWADInfo();
 	return iwad_info;
 }
diff --git a/src/d_main.h b/src/d_main.h
index 5addc5eb46..f48521f8c0 100644
--- a/src/d_main.h
+++ b/src/d_main.h
@@ -101,6 +101,7 @@ struct FIWADInfo
 	FString Required;		// Requires another IWAD
 	uint32_t FgColor = 0;	// Foreground color for title banner
 	uint32_t BkColor = 0xc0c0c0;		// Background color for title banner
+	FString Song;
 	EGameType gametype = GAME_Doom;		// which game are we playing?
 	int StartupType = FStartupInfo::DefaultStartup;		// alternate startup type
 	FString MapInfo;		// Base mapinfo to load
diff --git a/src/posix/cocoa/i_main.mm b/src/posix/cocoa/i_main.mm
index dbba5cea09..327628e95b 100644
--- a/src/posix/cocoa/i_main.mm
+++ b/src/posix/cocoa/i_main.mm
@@ -145,9 +145,6 @@ static void I_DetectOS()
 	
 	if (10 == majorVersion) switch (minorVersion)
 	{
-		case  4: name = "Mac OS X Tiger";        break;
-		case  5: name = "Mac OS X Leopard";      break;
-		case  6: name = "Mac OS X Snow Leopard"; break;
 		case  7: name = "Mac OS X Lion";         break;
 		case  8: name = "OS X Mountain Lion";    break;
 		case  9: name = "OS X Mavericks";        break;
diff --git a/wadsrc/static/zscript/shared/player.txt b/wadsrc/static/zscript/shared/player.txt
index 8ecce11cb2..7b7682e4cd 100644
--- a/wadsrc/static/zscript/shared/player.txt
+++ b/wadsrc/static/zscript/shared/player.txt
@@ -1269,7 +1269,7 @@ class PlayerPawn : Actor native
 	//----------------------------------------------------------------------------
 
 	native clearscope int GetMaxHealth(bool withupgrades = false) const;
-	native bool ResetAirSupply (bool playgasp = false);
+	native bool ResetAirSupply (bool playgasp = true);
 	native clearscope static String GetPrintableDisplayName(Class<Actor> cls);
 	native void CheckMusicChange();
 	native void CalcHeight ();