diff --git a/daggerheart.mjs b/daggerheart.mjs
index 0d9d5ae1..1366dc60 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -240,12 +240,12 @@ Hooks.on('moveToken', async (movedToken, data) => {
     const effectsAutomation = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).effects;
     if (!effectsAutomation.rangeDependent) return;
 
-    const rangeDependantEffects = movedToken.actor.effects.filter(effect => effect.system.rangeDependence.enabled);
+    const rangeDependantEffects = movedToken.actor.effects.filter(effect => effect.system.rangeDependence?.enabled);
 
     const updateEffects = async (disposition, token, effects, effectUpdates) => {
         const rangeMeasurement = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.RangeMeasurement);
 
-        for (let effect of effects.filter(x => x.system.rangeDependence.enabled)) {
+        for (let effect of effects.filter(x => x.system.rangeDependence?.enabled)) {
             const { target, range, type } = effect.system.rangeDependence;
             if ((target === 'friendly' && disposition !== 1) || (target === 'hostile' && disposition !== -1))
                 return false;
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 03dcb32c..66e743a3 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -307,8 +307,8 @@ export function updateLinkedItemApps(options, sheet) {
 export const itemAbleRollParse = (value, actor, item) => {
     if (!value) return value;
 
-    const isItemTarget = value.toLowerCase().replace('item.@', '@');
-    const slicedValue = isItemTarget ? value.slice(5) : value;
+    const isItemTarget = value.toLowerCase().includes('item.@');
+    const slicedValue = isItemTarget ? value.replaceAll(/item\.@/gi, '@') : value;
     try {
         return Roll.replaceFormulaData(slicedValue, isItemTarget ? item : actor);
     } catch (_) {
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index 46d63861..a9eb6e3b 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -241,19 +241,19 @@ Parameters:
     {{#unless hideDescription}}
     <div class="invetory-description"></div>
     {{/unless}}
-    {{!-- Dice Resource --}}
-    {{#if (and (not hideResources) (eq item.system.resource.type 'diceValue'))}}
-    {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
-    {{/if}}
-    {{!-- Actions Buttons --}}
-    {{#if (and showActions (eq item.type 'feature'))}}
-    <div class="item-buttons">
-      {{#each item.system.actions as | action |}}
-      <button type="button" data-action="useItem" data-item-uuid="{{action.uuid}}">
-        {{action.name}}
-      </button>
-      {{/each}}
-    </div>
-    {{/if}}
   </div>
+  {{!-- Dice Resource --}}
+  {{#if (and (not hideResources) (eq item.system.resource.type 'diceValue'))}}
+  {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
+  {{/if}}
+  {{!-- Actions Buttons --}}
+  {{#if (and showActions (eq item.type 'feature'))}}
+  <div class="item-buttons">
+    {{#each item.system.actions as | action |}}
+    <button type="button" data-action="useItem" data-item-uuid="{{action.uuid}}">
+      {{action.name}}
+    </button>
+    {{/each}}
+  </div>
+  {{/if}}
 </li>