diff --git a/BestiaryTracking.js b/BestiaryTracking.js
index ab01709..39ec3ad 100644
--- a/BestiaryTracking.js
+++ b/BestiaryTracking.js
@@ -6561,7 +6561,9 @@ class NPC extends Creature {
   }
 
   get initialType() {
-    const filteredCategories = game.user.isGM ? this.npcData.categories : this.npcData.categories.filter(x => !x.hidden);
+    const filteredCategories = game.user.isGM
+      ? this.npcData.categories
+      : this.npcData.categories.filter((x) => !x.hidden);
     return filteredCategories.length > 0
       ? filteredCategories.value
       : "unaffiliated";
@@ -16351,7 +16353,7 @@ Hooks.on("getActorSheetHeaderButtons", (options, buttons) => {
                   icon: "fas fa-check",
                   default: true,
                   callback: () => {
-                    PF2EBestiary.addMonster(options.object, true);
+                    PF2EBestiary.addMonster(options.object.token.baseActor, true);
                   },
                 },
                 {
diff --git a/pf2e-bestiary-tracking.js b/pf2e-bestiary-tracking.js
index 5b9f6b3..f1c8966 100644
--- a/pf2e-bestiary-tracking.js
+++ b/pf2e-bestiary-tracking.js
@@ -755,7 +755,10 @@ Hooks.on("getActorSheetHeaderButtons", (options, buttons) => {
                   icon: "fas fa-check",
                   default: true,
                   callback: () => {
-                    PF2EBestiary.addMonster(options.object, true);
+                    PF2EBestiary.addMonster(
+                      options.object.token.baseActor,
+                      true,
+                    );
                   },
                 },
                 {