diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index 7300d4ef..4d336465 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -117,6 +117,8 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     async use(event, ...args) {
         if (!this.actor) throw new Error("An Action can't be used outside of an Actor context.");
 
+        if(this.chatDisplay) this.toChat();
+
         let config = this.prepareConfig(event);
         for(let i = 0; i < this.constructor.extraSchemas.length; i++) {
             let clsField = this.constructor.getActionField(this.constructor.extraSchemas[i]);
diff --git a/module/data/chat-message/adversaryRoll.mjs b/module/data/chat-message/adversaryRoll.mjs
index 1e2d8da1..11368783 100644
--- a/module/data/chat-message/adversaryRoll.mjs
+++ b/module/data/chat-message/adversaryRoll.mjs
@@ -1,5 +1,3 @@
-import DHBaseAction from '../../data/action/baseAction.mjs';
-
 const fields = foundry.data.fields;
 
 export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
@@ -44,7 +42,7 @@ export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
         this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0;
         this.currentTargets =
             this.targetSelection !== true
-                ? Array.from(game.user.targets).map(t => DHBaseAction.formatTarget(t))
+                ? Array.from(game.user.targets).map(t => game.system.api.fields.ActionFields.TargetField.formatTarget(t))
                 : this.targets;
     }
 }
diff --git a/module/data/chat-message/applyEffects.mjs b/module/data/chat-message/applyEffects.mjs
index a7fdda69..045f779d 100644
--- a/module/data/chat-message/applyEffects.mjs
+++ b/module/data/chat-message/applyEffects.mjs
@@ -1,5 +1,3 @@
-import DHBaseAction from "../action/baseAction.mjs";
-
 export default class DHApplyEffect extends foundry.abstract.TypeDataModel {
     static defineSchema() {
         const fields = foundry.data.fields;
@@ -27,7 +25,7 @@ export default class DHApplyEffect extends foundry.abstract.TypeDataModel {
         this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0;
         this.currentTargets =
             this.targetSelection !== true
-                ? Array.from(game.user.targets).map(t => DHBaseAction.formatTarget(t))
+                ? Array.from(game.user.targets).map(t => game.system.api.fields.ActionFields.TargetField.formatTarget(t))
                 : this.targets;
     }
 
diff --git a/module/data/chat-message/damageRoll.mjs b/module/data/chat-message/damageRoll.mjs
index 6d54b3f7..e8b821c8 100644
--- a/module/data/chat-message/damageRoll.mjs
+++ b/module/data/chat-message/damageRoll.mjs
@@ -40,7 +40,7 @@ export default class DHDamageRoll extends foundry.abstract.TypeDataModel {
         this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0;
         this.currentTargets =
             this.targetSelection !== true
-                ? Array.from(game.user.targets).map(t => DHBaseAction.formatTarget(t))
+                ? Array.from(game.user.targets).map(t => game.system.api.fields.ActionFields.TargetField.formatTarget(t))
                 : this.targets;
     }
 }
diff --git a/module/documents/item.mjs b/module/documents/item.mjs
index e75547f3..3f869a5d 100644
--- a/module/documents/item.mjs
+++ b/module/documents/item.mjs
@@ -106,8 +106,6 @@ export default class DHItem extends foundry.documents.Item {
             }
             if (action) return action.use(event);
         }
-
-        return this.toChat();
     }
 
     async toChat(origin) {
diff --git a/templates/ui/chat/parts/target-chat.hbs b/templates/ui/chat/parts/target-chat.hbs
index 1da6cec0..a5844c04 100644
--- a/templates/ui/chat/parts/target-chat.hbs
+++ b/templates/ui/chat/parts/target-chat.hbs
@@ -9,7 +9,7 @@
                     <label class="button-target-selection{{#unless @root.targetSelection}} target-selected{{/unless}}">{{localize "DAGGERHEART.UI.Chat.damageRoll.selectedTarget"}}</label>
                 </div>
                 {{#if (and hasSave @root.targetSelection @root.hasHitTarget)}}
-                    <button class="inner-button inner-button-right roll-all-save-button">{{localize "DAGERHEART.GENERAL.rollAll"}} <i class="fa-solid fa-shield"></i></button>
+                    <button class="inner-button inner-button-right roll-all-save-button">{{localize "DAGGERHEART.GENERAL.rollAll"}} <i class="fa-solid fa-shield"></i></button>
                 {{/if}}
                 <div class="target-section">
                     {{#each currentTargets as |target|}}