diff --git a/src/sound/i_musicinterns.h b/src/sound/i_musicinterns.h
index 531d69ec70..9bf9f8aede 100644
--- a/src/sound/i_musicinterns.h
+++ b/src/sound/i_musicinterns.h
@@ -363,7 +363,12 @@ public:
 	void WildMidiSetOption(int opt, int set);
 	void CreateSMF(TArray<uint8_t> &file, int looplimit=0);
 	int ServiceEvent();
-	int GetDeviceType() const override { return MIDI->GetDeviceType(); }
+	int GetDeviceType() const override
+	{
+		return nullptr == MIDI
+			? MusInfo::GetDeviceType()
+			: MIDI->GetDeviceType();
+	}
 
 protected:
 	MIDIStreamer(const char *dumpname, EMidiDevice type);
diff --git a/wadsrc/static/zscript/inventory/armor.txt b/wadsrc/static/zscript/inventory/armor.txt
index 600c4e5265..1ffe70e79c 100644
--- a/wadsrc/static/zscript/inventory/armor.txt
+++ b/wadsrc/static/zscript/inventory/armor.txt
@@ -214,7 +214,7 @@ class BasicArmor : Armor
 		// Once the armor has absorbed its part of the damage, then apply its damage factor, if any, to the player
 		if ((damage > 0) && (ArmorType != 'None')) // BasicArmor is not going to have any damage factor, so skip it.
 		{
-			ApplyDamageFactors(ArmorType, damageType, damage, damage);
+			newdamage = ApplyDamageFactors(ArmorType, damageType, damage, damage);
 		}
 	}
 }