diff --git a/data/magic-m15-altered.mse-style/style b/data/magic-m15-altered.mse-style/style
index 20edf4117..b0ff70e7e 100644
--- a/data/magic-m15-altered.mse-style/style
+++ b/data/magic-m15-altered.mse-style/style
@@ -350,7 +350,8 @@ init script:
 	}
 	body_font_italic := {
 		swap_font_italic(
-			src: styling.custom_body_font
+			src: styling.custom_body_font,
+			font_name: "MPlantin-Italic"
 		)
 	}
 
diff --git a/data/magic-m15-saga.mse-style/style b/data/magic-m15-saga.mse-style/style
index 0a19be010..68f703cf3 100644
--- a/data/magic-m15-saga.mse-style/style
+++ b/data/magic-m15-saga.mse-style/style
@@ -193,7 +193,7 @@ init script:
 	un_png := replace@(match:".png", replace: "")
 	a_saga := {true}
 	saga_reminder := { if styling.alternate_reminder != "" then styling.alternate_reminder else if is_class() then "Gain the next level as a sorcery to add its ability." else "As this Saga enters and after your draw step, add a lore counter. Sacrifice after III." }
-	is_class := {contains(styling.other_options, match:"class") or lang_setting("is_class")(card.sub_type)}
+	is_class := {contains(styling.other_options, match:"class") or lang_setting("is_class")(remove_tags(card.sub_type))}
 	un_marked := {is_class() or contains(styling.other_options, match:"remove bookmark")}
 	is_legend :=	{ auto_legend() }
 	is_vehicle :=	{ auto_vehicle()	or contains(styling.other_options, match:"vehicle") }
diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script
index 13cbe542e..449168f45 100644
--- a/data/magic.mse-game/script
+++ b/data/magic.mse-game/script
@@ -2193,10 +2193,9 @@ swap_font_vertical := {
 	vertical
 }@(vertical:0, src:"")
 swap_font_italic := {
-	font_name := "MPlantin-Italic"
 	if swap_font() then (
-		test := pop_font_italic(styling.custom_body_font)
-		test2 := pop_font_name(styling.custom_body_font)
+		test := pop_font_italic(src)
+		test2 := pop_font_name(src)
 		if test != "" then font_name := test
 		else if test2 != "" then font_name := ""
 	)