diff --git a/packs/deities/calistria.json b/packs/deities/calistria.json
index 1847af3ab5b..b1491b1b51e 100644
--- a/packs/deities/calistria.json
+++ b/packs/deities/calistria.json
@@ -27,7 +27,7 @@
         "publication": {
             "license": "ORC",
             "remaster": true,
-            "title": "Lost Omens - Divine Mysteries"
+            "title": "Pathfinder Lost Omens: Divine Mysteries"
         },
         "rules": [],
         "sanctification": {
diff --git a/packs/pathfinder-bestiary-2/giant-crab.json b/packs/pathfinder-bestiary-2/giant-crab.json
index a22645a9189..990e6a6e919 100644
--- a/packs/pathfinder-bestiary-2/giant-crab.json
+++ b/packs/pathfinder-bestiary-2/giant-crab.json
@@ -125,6 +125,7 @@
                             "vulnerable-prone"
                         ],
                         "selector": "ac",
+                        "type": "circumstance",
                         "value": -4
                     }
                 ],
diff --git a/packs/pfs-season-6-bestiary/6-06/enraged-the-heartwood-rots.json b/packs/pfs-season-6-bestiary/6-06/enraged-the-heartwood-rots.json
index 2ddd40e8216..66e4861ae99 100644
--- a/packs/pfs-season-6-bestiary/6-06/enraged-the-heartwood-rots.json
+++ b/packs/pfs-season-6-bestiary/6-06/enraged-the-heartwood-rots.json
@@ -144,6 +144,38 @@
             },
             "type": "melee"
         },
+        {
+            "_id": "kztyfqilO3cN1BeS",
+            "img": "systems/pf2e/icons/default-icons/action.svg",
+            "name": "Children of the Night",
+            "sort": 400000,
+            "system": {
+                "actionType": {
+                    "value": "passive"
+                },
+                "actions": {
+                    "value": null
+                },
+                "category": "interaction",
+                "description": {
+                    "value": "<p>The vampire's presence brings forth creatures of the night to do the master's bidding. These typically include rat swarms, bat swarms, and wolves but can include other creatures. The vampire can give telepathic orders to these creatures as long as they're within 100 feet, but they can't communicate back.</p>"
+                },
+                "publication": {
+                    "license": "OGL",
+                    "remaster": false,
+                    "title": ""
+                },
+                "rules": [],
+                "slug": null,
+                "traits": {
+                    "value": [
+                        "divine",
+                        "mental"
+                    ]
+                }
+            },
+            "type": "action"
+        },
         {
             "_id": "EbHWJVc8RxjR7Fek",
             "_stats": {
@@ -151,7 +183,7 @@
             },
             "img": "systems/pf2e/icons/actions/Passive.webp",
             "name": "Constant Spells",
-            "sort": 400000,
+            "sort": 500000,
             "system": {
                 "actionType": {
                     "value": "passive"
@@ -183,7 +215,7 @@
             },
             "img": "systems/pf2e/icons/actions/Passive.webp",
             "name": "Fast Healing 7",
-            "sort": 500000,
+            "sort": 600000,
             "system": {
                 "actionType": {
                     "value": "passive"
@@ -225,7 +257,7 @@
             },
             "img": "systems/pf2e/icons/actions/Passive.webp",
             "name": "Coffin Restoration",
-            "sort": 600000,
+            "sort": 700000,
             "system": {
                 "actionType": {
                     "value": "passive"
@@ -261,7 +293,7 @@
             },
             "img": "systems/pf2e/icons/actions/FreeAction.webp",
             "name": "Mist Escape",
-            "sort": 700000,
+            "sort": 800000,
             "system": {
                 "actionType": {
                     "value": "free"
@@ -291,7 +323,7 @@
             "_id": "tfYmL4tSNRyScITd",
             "img": "systems/pf2e/icons/default-icons/action.svg",
             "name": "Rotten Burst",
-            "sort": 800000,
+            "sort": 900000,
             "system": {
                 "actionType": {
                     "value": "passive"
@@ -327,7 +359,7 @@
             },
             "img": "systems/pf2e/icons/actions/Passive.webp",
             "name": "Vampire Vulnerabilities",
-            "sort": 900000,
+            "sort": 1000000,
             "system": {
                 "actionType": {
                     "value": "passive"
@@ -379,7 +411,7 @@
             },
             "img": "systems/pf2e/icons/actions/Passive.webp",
             "name": "Void Healing",
-            "sort": 1000000,
+            "sort": 1100000,
             "system": {
                 "actionType": {
                     "value": "passive"
@@ -418,7 +450,7 @@
             },
             "img": "systems/pf2e/icons/actions/OneAction.webp",
             "name": "Change Shape",
-            "sort": 1100000,
+            "sort": 1200000,
             "system": {
                 "actionType": {
                     "value": "action"
@@ -492,7 +524,7 @@
             },
             "img": "systems/pf2e/icons/actions/Passive.webp",
             "name": "Create Servitor",
-            "sort": 1200000,
+            "sort": 1300000,
             "system": {
                 "actionType": {
                     "value": "passive"
@@ -527,7 +559,7 @@
             },
             "img": "systems/pf2e/icons/actions/TwoActions.webp",
             "name": "Dominate",
-            "sort": 1300000,
+            "sort": 1400000,
             "system": {
                 "actionType": {
                     "value": "action"
@@ -564,7 +596,7 @@
             },
             "img": "systems/pf2e/icons/actions/OneAction.webp",
             "name": "Drink Blood",
-            "sort": 1400000,
+            "sort": 1500000,
             "system": {
                 "actionType": {
                     "value": "action"
@@ -598,7 +630,7 @@
             },
             "img": "systems/pf2e/icons/actions/OneAction.webp",
             "name": "Turn to Mist",
-            "sort": 1500000,
+            "sort": 1600000,
             "system": {
                 "actionType": {
                     "value": "action"
@@ -642,7 +674,7 @@
             },
             "img": "systems/pf2e/icons/actions/OneAction.webp",
             "name": "Grab",
-            "sort": 1600000,
+            "sort": 1700000,
             "system": {
                 "actionType": {
                     "value": "action"
@@ -666,38 +698,6 @@
                 }
             },
             "type": "action"
-        },
-        {
-            "_id": "kztyfqilO3cN1BeS",
-            "img": "systems/pf2e/icons/default-icons/action.svg",
-            "name": "Children of the Night",
-            "sort": 1700000,
-            "system": {
-                "actionType": {
-                    "value": "passive"
-                },
-                "actions": {
-                    "value": null
-                },
-                "category": null,
-                "description": {
-                    "value": "<p>The vampire's presence brings forth creatures of the night to do the master's bidding. These typically include rat swarms, bat swarms, and wolves but can include other creatures. The vampire can give telepathic orders to these creatures as long as they're within 100 feet, but they can't communicate back.</p>"
-                },
-                "publication": {
-                    "license": "OGL",
-                    "remaster": false,
-                    "title": ""
-                },
-                "rules": [],
-                "slug": null,
-                "traits": {
-                    "value": [
-                        "divine",
-                        "mental"
-                    ]
-                }
-            },
-            "type": "action"
         }
     ],
     "name": "Enraged The Heartwood Rots",
diff --git a/packs/sky-kings-tomb-bestiary/lady-shimmersnip.json b/packs/sky-kings-tomb-bestiary/lady-shimmersnip.json
index 6834b36ed18..ec19b9ce5e1 100644
--- a/packs/sky-kings-tomb-bestiary/lady-shimmersnip.json
+++ b/packs/sky-kings-tomb-bestiary/lady-shimmersnip.json
@@ -249,6 +249,7 @@
                             "vulnerable-prone"
                         ],
                         "selector": "ac",
+                        "type": "circumstance",
                         "value": -4
                     }
                 ],