diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index 5f557aa8..889f25c3 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -597,7 +597,7 @@ export default class DhpActor extends Actor {
 
         await this.modifyResource(updates);
 
-        Hooks.call(`${CONFIG.DH.id}.postTakeDamage`, this, updates);
+        if (Hooks.call(`${CONFIG.DH.id}.postTakeDamage`, this, updates) === false) return null;
 
         return updates;
     }
@@ -647,7 +647,8 @@ export default class DhpActor extends Actor {
 
         await this.modifyResource(updates);
 
-        Hooks.call(`${CONFIG.DH.id}.postTakeHealing`, this, updates);
+        if (Hooks.call(`${CONFIG.DH.id}.postTakeHealing`, this, updates) === false) return null;
+
         return updates;
     }
 
diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs
index 9b7565f3..94e1879a 100644
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@@ -133,41 +133,12 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
         });
 
         html.querySelectorAll('.token-target-container').forEach(element => {
-            element.addEventListener('pointerover', this._onTokenTargetHoverIn.bind(this));
-            element.addEventListener('pointerout', this._onTokenTargetHoverOut.bind(this));
-            element.addEventListener('click', this._onTokenTargetClick.bind(this));
+            element.addEventListener('pointerover', this.hoverTarget);
+            element.addEventListener('pointerout', this.unhoverTarget);
+            element.addEventListener('click', this.clickTarget);
         });
     }
 
-    async _onTokenTargetHoverIn(event) {
-        const { tokenUuid } = event.target.dataset;
-        if (!canvas.ready || !tokenUuid) return;
-
-        const token = await foundry.utils.fromUuid(tokenUuid);
-        if (token?.object && token.object._canHover(game.user, event) && token.object.visible) {
-            token.object._onHoverIn(event, { hoverOutOthers: true });
-        }
-    }
-
-    async _onTokenTargetHoverOut(event) {
-        const { tokenUuid } = event.target.dataset;
-        if (!canvas.ready || !tokenUuid) return;
-
-        const token = await foundry.utils.fromUuid(tokenUuid);
-        if (token?.object) token.object._onHoverOut(event);
-    }
-
-    async _onTokenTargetClick(event) {
-        const { tokenUuid } = event.target.dataset;
-        if (!canvas.ready || !tokenUuid) return;
-
-        const token = await foundry.utils.fromUuid(tokenUuid);
-        if (token?.object) {
-            const { _x: x, _y: y } = token.object.position;
-            game.canvas.pan({ x, y });
-        }
-    }
-
     getTargetList() {
         const targets = this.system.hitTargets ?? [];
         return targets.map(target => game.canvas.tokens.documentCollection.find(t => t.actor?.uuid === target.actorId));
diff --git a/templates/ui/chat/damageSummary.hbs b/templates/ui/chat/damageSummary.hbs
index c88d0cbf..5b3b8b1b 100644
--- a/templates/ui/chat/damageSummary.hbs
+++ b/templates/ui/chat/damageSummary.hbs
@@ -1,6 +1,6 @@
 <ul class="daggerheart chat damage-summary">
     {{#each targets}}
-        <li class="token-target-container" data-token-uuid="{{this.token.uuid}}">
+        <li class="token-target-container" data-token="{{this.token.id}}">
             <header>
                 <img src="{{this.token.texture.src}}" />
                 <h2 class="actor-name">{{this.token.name}}</h2>
diff --git a/templates/ui/chat/effectSummary.hbs b/templates/ui/chat/effectSummary.hbs
index 047a524e..1b7badb2 100644
--- a/templates/ui/chat/effectSummary.hbs
+++ b/templates/ui/chat/effectSummary.hbs
@@ -23,7 +23,7 @@
         </div>
         <div class="targets-container">
             {{#each targets}}
-                <div class="token-target-container" data-token-uuid="{{this.uuid}}">
+                <div class="token-target-container" data-token="{{this.id}}">
                     <img src="{{this.texture.src}}" />
                     <h2 class="title">{{this.name}}</h2>
                 </div>