diff --git a/packs/spells/dinosaur-fort.json b/packs/spells/dinosaur-fort.json
index 0bdc900c81a..aeb2ba27ebe 100644
--- a/packs/spells/dinosaur-fort.json
+++ b/packs/spells/dinosaur-fort.json
@@ -11,7 +11,7 @@
         "damage": {},
         "defense": null,
         "description": {
-            "value": "<p>You conjure a primeval fort with walls of sharpened wood adorned with dinosaur skin and teeth, up to 300 feet on a side. Each of the four quadrants of the fort is guarded by a @UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Tyrannosaurus]{Tyrannosaurus}. While the tyrannosauruses won't cross into the others' territories, their reach allows them to simultaneously attack an intruder near the center of the fort. The tyrannosauruses leave you and anyone you introduce to them alone but treat anyone else they find in the fort as intruders and prospective snacks. When you prepare spells, you can choose not to recover the spell slot you used to cast this spell. If you do, the fort remains for another 24 hours.</p>\n<p>The fort must be created on a plot of land free of other structures. It adapts to the natural terrain, adopting the structural requirements for being built there. The fort adjusts around small features, such as ponds or spires of rock, but can't be created on water or other nonsolid surfaces. If created on snow, sand dunes, or other soft surfaces with a solid surface underneath, the foundation reaches solid ground. If created on a solid but unstable surface, such as a swamp or an area plagued by tremors, roll a @Check[flat|dc:3] each day the fort is present; on a failure, the fort sinks or collapses sometime during that day, and the spell ends.</p>\n<p>The fort doesn't harm creatures within the area when it appears, and it can't be created within a crowd or in a densely populated area. Any creature inadvertently caught inside the fort when the spell is cast ends up unharmed inside the complete fort and always has a clear path of escape.</p>"
+            "value": "<p>You conjure a primeval fort with walls of sharpened wood adorned with dinosaur skin and teeth, up to 300 feet on a side. Each of the four quadrants of the fort is guarded by a @UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Tyrannosaurus]. While the tyrannosauruses won't cross into the others' territories, their reach allows them to simultaneously attack an intruder near the center of the fort. The tyrannosauruses leave you and anyone you introduce to them alone but treat anyone else they find in the fort as intruders and prospective snacks. When you prepare spells, you can choose not to recover the spell slot you used to cast this spell. If you do, the fort remains for another 24 hours.</p>\n<p>The fort must be created on a plot of land free of other structures. It adapts to the natural terrain, adopting the structural requirements for being built there. The fort adjusts around small features, such as ponds or spires of rock, but can't be created on water or other nonsolid surfaces. If created on snow, sand dunes, or other soft surfaces with a solid surface underneath, the foundation reaches solid ground. If created on a solid but unstable surface, such as a swamp or an area plagued by tremors, roll a @Check[flat|dc:3] each day the fort is present; on a failure, the fort sinks or collapses sometime during that day, and the spell ends.</p>\n<p>The fort doesn't harm creatures within the area when it appears, and it can't be created within a crowd or in a densely populated area. Any creature inadvertently caught inside the fort when the spell is cast ends up unharmed inside the complete fort and always has a clear path of escape.</p>"
         },
         "duration": {
             "sustained": false,
diff --git a/packs/spells/envenom-companion.json b/packs/spells/envenom-companion.json
index 965a2d1951c..43082aaa97f 100644
--- a/packs/spells/envenom-companion.json
+++ b/packs/spells/envenom-companion.json
@@ -9,7 +9,13 @@
         },
         "counteraction": false,
         "damage": {},
-        "defense": null,
+        "defense": {
+            "passive": null,
+            "save": {
+                "basic": false,
+                "statistic": "fortitude"
+            }
+        },
         "description": {
             "value": "<p>You envenom your companion or eidolon's attacks, which drip with highly toxic venom for the spell's duration. The first time each round the target hits a creature with an unarmed Strike that deals piercing or slashing damage, that Strike deals an additional 1d8 poison damage. A creature that is damaged by this poison must attempt a Fortitude save. On a failure, it's also @UUID[Compendium.pf2e.conditionitems.Item.Clumsy]{Clumsy 1} for 1 round. This spell can't target familiars.</p>\n<p>@UUID[Compendium.pf2e.spell-effects.Item.Spell Effect: Envenom Companion]</p>\n<hr />\n<p><strong>Heightened (+3)</strong> The poison damage increases by 1d8 and the clumsy value imposed on a failed save increases by 1.</p>"
         },
diff --git a/packs/spells/shambling-horror.json b/packs/spells/shambling-horror.json
index 9077828d5d3..47348225490 100644
--- a/packs/spells/shambling-horror.json
+++ b/packs/spells/shambling-horror.json
@@ -11,7 +11,7 @@
         "damage": {},
         "defense": null,
         "description": {
-            "value": "<p>You reanimate the corpse of a fallen creature as an undead minion under your control. The reanimated creature is an undead skeleton or zombie. Choose a skeleton or zombie stat block of the same size as the original creature and of a level no higher than the creature's original level. The shambling horror keeps Speeds it had in life, as well as melee Strikes that deal only physical damage. These attacks use the highest attack modifier from the skeleton or zombie you choose. Some of the skeleton's or zombie's abilities might not make sense for the shambling horror, and some abilities the creature had in life might not persist in undeath; the GM makes the final choice of what abilities the horror has.</p>\n<p>A shambling horror has the minion trait. You can't control more than one shambling horror at the same time-if you create a new one while one is already under your control, you must choose one to release, causing it to lose the minion trait. Shambling horrors that have been released expire when the spell duration does. After the duration expires, you can cast shambling horror again on the same corpse to animate it once more. However, after the next sunrise, you can no longer animate the corpse as a shambling horror.</p>\n<h2>Undead Skeletons</h2>\n<table class=\"pf2e\">\n<thead>\n<tr>\n<th>Level</th>\n<th>Size</th>\n<th>Creature Name</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>-1</td>\n<td>Medium</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Skeleton Guard]{Skeleton Guard}</td>\n</tr>\n<tr>\n<td>0</td>\n<td>Medium</td>\n<td>Wolf Skeleton</td>\n</tr>\n<tr>\n<td>1</td>\n<td>Medium</td>\n<td>Skeletal Soldier</td>\n</tr>\n<tr>\n<td>2</td>\n<td>Medium</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Skeletal Champion]{Skeletal Champion}</td>\n</tr>\n<tr>\n<td>2</td>\n<td>Large</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Skeletal Horse]{Skeletal Horse}</td>\n</tr>\n<tr>\n<td>3</td>\n<td>Large</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Skeletal Giant]{Skeletal Giant}</td>\n</tr>\n<tr>\n<td>5</td>\n<td>Medium</td>\n<td>@UUID[Compendium.pf2e.pathfinder-bestiary-3.Actor.Harpy Skeleton]</td>\n</tr>\n<tr>\n<td>5</td>\n<td>Medium</td>\n<td>Skeletal Mage</td>\n</tr>\n<tr>\n<td>6</td>\n<td>Large</td>\n<td>Beetle Carapace</td>\n</tr>\n<tr>\n<td>7</td>\n<td>Huge</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Skeletal Hulk]{Skeletal Hulk}</td>\n</tr>\n<tr>\n<td>8</td>\n<td>Large</td>\n<td>Drake Skeleton</td>\n</tr>\n<tr>\n<td>9</td>\n<td>Gargantuan</td>\n<td>@UUID[Compendium.pf2e.pathfinder-bestiary-3.Actor.Tyrannosaurus Skeleton]</td>\n</tr>\n<tr>\n<td>11</td>\n<td>Gargantuan</td>\n<td>@UUID[Compendium.pf2e.pathfinder-bestiary-3.Actor.Skeleton Infantry]</td>\n</tr>\n<tr>\n<td>13</td>\n<td>Gargantuan</td>\n<td>Skeletal Titan</td>\n</tr>\n</tbody>\n</table>\n<h2>Zombies</h2>\n<table class=\"pf2e\">\n<thead>\n<tr>\n<th>Level</th>\n<th>Size</th>\n<th>Creature Name</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>-1</td>\n<td>Medium</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Zombie Shambler]{Zombie Shambler}</td>\n</tr>\n<tr>\n<td>0</td>\n<td>Medium</td>\n<td>Zombie Snake</td>\n</tr>\n<tr>\n<td>1</td>\n<td>Medium</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Plague Zombie]{Plague Zombie}</td>\n</tr>\n<tr>\n<td>2</td>\n<td>Medium</td>\n<td>Husk Zombie</td>\n</tr>\n<tr>\n<td>2</td>\n<td>Large</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Zombie Brute]{Zombie Brute}</td>\n</tr>\n<tr>\n<td>3</td>\n<td>Large</td>\n<td>Zombie Owlbear</td>\n</tr>\n<tr>\n<td>4</td>\n<td>Gargantuan</td>\n<td>@UUID[Compendium.pf2e.pathfinder-bestiary-3.Actor.Shambler Troop]</td>\n</tr>\n<tr>\n<td>4</td>\n<td>Medium</td>\n<td>Zombie Lord</td>\n</tr>\n<tr>\n<td>5</td>\n<td>Medium</td>\n<td>Withered</td>\n</tr>\n<tr>\n<td>6</td>\n<td>Medium</td>\n<td>@UUID[Compendium.pf2e.pathfinder-bestiary-3.Actor.Sulfur Zombie]</td>\n</tr>\n<tr>\n<td>6</td>\n<td>Huge</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Zombie Hulk]{Zombie Hulk}</td>\n</tr>\n<tr>\n<td>9</td>\n<td>Huge</td>\n<td>@UUID[Compendium.pf2e.pathfinder-bestiary-3.Actor.Zombie Dragon]</td>\n</tr>\n<tr>\n<td>11</td>\n<td>Huge</td>\n<td>Zombie Mammoth</td>\n</tr>\n</tbody>\n</table>"
+            "value": "<p>You reanimate the corpse of a fallen creature as an undead minion under your control. The reanimated creature is an undead skeleton or zombie. Choose a skeleton or zombie stat block of the same size as the original creature and of a level no higher than the creature's original level. The shambling horror keeps Speeds it had in life, as well as melee Strikes that deal only physical damage. These attacks use the highest attack modifier from the skeleton or zombie you choose. Some of the skeleton's or zombie's abilities might not make sense for the shambling horror, and some abilities the creature had in life might not persist in undeath; the GM makes the final choice of what abilities the horror has.</p>\n<p>A shambling horror has the minion trait. You can't control more than one shambling horror at the same time-if you create a new one while one is already under your control, you must choose one to release, causing it to lose the minion trait. Shambling horrors that have been released expire when the spell duration does. After the duration expires, you can cast shambling horror again on the same corpse to animate it once more. However, after the next sunrise, you can no longer animate the corpse as a shambling horror.</p>\n<h2>Undead Skeletons</h2>\n<table class=\"pf2e\">\n<thead>\n<tr>\n<th>Level</th>\n<th>Size</th>\n<th>Creature Name</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>-1</td>\n<td>Medium</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Skeleton Guard]</td>\n</tr>\n<tr>\n<td>0</td>\n<td>Medium</td>\n<td>Wolf Skeleton</td>\n</tr>\n<tr>\n<td>1</td>\n<td>Medium</td>\n<td>Skeletal Soldier</td>\n</tr>\n<tr>\n<td>2</td>\n<td>Medium</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Skeletal Champion]</td>\n</tr>\n<tr>\n<td>2</td>\n<td>Large</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Skeletal Horse]</td>\n</tr>\n<tr>\n<td>3</td>\n<td>Large</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Skeletal Giant]</td>\n</tr>\n<tr>\n<td>5</td>\n<td>Medium</td>\n<td>@UUID[Compendium.pf2e.pathfinder-bestiary-3.Actor.Harpy Skeleton]</td>\n</tr>\n<tr>\n<td>5</td>\n<td>Medium</td>\n<td>Skeletal Mage</td>\n</tr>\n<tr>\n<td>6</td>\n<td>Large</td>\n<td>Beetle Carapace</td>\n</tr>\n<tr>\n<td>7</td>\n<td>Huge</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Skeletal Hulk]</td>\n</tr>\n<tr>\n<td>8</td>\n<td>Large</td>\n<td>Drake Skeleton</td>\n</tr>\n<tr>\n<td>9</td>\n<td>Gargantuan</td>\n<td>@UUID[Compendium.pf2e.pathfinder-bestiary-3.Actor.Tyrannosaurus Skeleton]</td>\n</tr>\n<tr>\n<td>11</td>\n<td>Gargantuan</td>\n<td>@UUID[Compendium.pf2e.pathfinder-bestiary-3.Actor.Skeleton Infantry]</td>\n</tr>\n<tr>\n<td>13</td>\n<td>Gargantuan</td>\n<td>Skeletal Titan</td>\n</tr>\n</tbody>\n</table>\n<h2>Zombies</h2>\n<table class=\"pf2e\">\n<thead>\n<tr>\n<th>Level</th>\n<th>Size</th>\n<th>Creature Name</th>\n</tr>\n</thead>\n<tbody>\n<tr>\n<td>-1</td>\n<td>Medium</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Zombie Shambler]</td>\n</tr>\n<tr>\n<td>0</td>\n<td>Medium</td>\n<td>Zombie Snake</td>\n</tr>\n<tr>\n<td>1</td>\n<td>Medium</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Plague Zombie]</td>\n</tr>\n<tr>\n<td>2</td>\n<td>Medium</td>\n<td>Husk Zombie</td>\n</tr>\n<tr>\n<td>2</td>\n<td>Large</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Zombie Brute]</td>\n</tr>\n<tr>\n<td>3</td>\n<td>Large</td>\n<td>Zombie Owlbear</td>\n</tr>\n<tr>\n<td>4</td>\n<td>Gargantuan</td>\n<td>@UUID[Compendium.pf2e.pathfinder-bestiary-3.Actor.Shambler Troop]</td>\n</tr>\n<tr>\n<td>4</td>\n<td>Medium</td>\n<td>Zombie Lord</td>\n</tr>\n<tr>\n<td>5</td>\n<td>Medium</td>\n<td>Withered</td>\n</tr>\n<tr>\n<td>6</td>\n<td>Medium</td>\n<td>@UUID[Compendium.pf2e.pathfinder-bestiary-3.Actor.Sulfur Zombie]</td>\n</tr>\n<tr>\n<td>6</td>\n<td>Huge</td>\n<td>@UUID[Compendium.pf2e.pathfinder-monster-core.Actor.Zombie Hulk]</td>\n</tr>\n<tr>\n<td>9</td>\n<td>Huge</td>\n<td>@UUID[Compendium.pf2e.pathfinder-bestiary-3.Actor.Zombie Dragon]</td>\n</tr>\n<tr>\n<td>11</td>\n<td>Huge</td>\n<td>Zombie Mammoth</td>\n</tr>\n</tbody>\n</table>"
         },
         "duration": {
             "sustained": false,