diff --git a/src/Roster.jsx b/src/Roster.jsx
index df7380c..3995d82 100644
--- a/src/Roster.jsx
+++ b/src/Roster.jsx
@@ -48,7 +48,7 @@ const Force = ({ force, onePerPage }) => {
 		>
 			{units.map((unit, index) => (
 				<Unit
-					key={index}
+					key={unit.name + index}
 					index={index}
 					unit={unit}
 					catalog={catalog}
diff --git a/src/Weapons.jsx b/src/Weapons.jsx
index 1022764..844d7ad 100644
--- a/src/Weapons.jsx
+++ b/src/Weapons.jsx
@@ -138,6 +138,7 @@ const Weapon = ({
 			"Each time an attack is made with this weapon profile, that attack automatically hits the target.",
 			"This weapon automatically hits its target.",
 			"This weapon automatically hits its targets.",
+			"This weapon hits automatically",
 			"When resolving an attack made with this weapon, do not make a hit roll: it automatically scores a hit.",
 		],
 		"Torrent",
@@ -292,6 +293,9 @@ const Weapon = ({
 		) ||
 		abilities?.includes(
 			"Each time an attack roll is made with this weapon, subtract 1 from the attack's hit roll"
+		) ||
+		abilities?.includes(
+			"When resolving an attack made with this weapon, subtract 1 from the hit roll"
 		)
 	) {
 		abilities = abilities
@@ -322,6 +326,10 @@ const Weapon = ({
 			.replaceAll(
 				"Each time an attack roll is made with this weapon, subtract 1 from the attack's hit roll",
 				""
+			)
+			.replaceAll(
+				"When resolving an attack made with this weapon, subtract 1 from the hit roll",
+				""
 			);
 		ws = ws.map((ws) => `${parseInt(ws, 10) + 1}+`);
 	}
@@ -399,6 +407,9 @@ const Weapon = ({
 	if (bs.every((b) => b === bs[0])) {
 		bs = bs[0];
 	}
+	if (type.includes("Torrent")) {
+		bs = "N/A";
+	}
 	if (ws.every((w) => w === ws[0])) {
 		ws = ws[0];
 	}