diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js
index a6401c1..410e213 100644
--- a/module/actor/actor-sheet.js
+++ b/module/actor/actor-sheet.js
@@ -109,8 +109,8 @@ export class frostgraveActorSheet extends ActorSheet {
         const dataset = element.dataset;
 
         if (dataset.roll) {
-            let roll = new Roll(dataset.roll, this.actor.data.data);
-            let damage = parseInt(roll.roll().total) + parseInt(dataset.bonus);
+            let roll = new Roll(dataset.roll, this.actor.data.data );
+            let damage = parseInt(roll.evaluate( {async: false} ).total) + parseInt(dataset.bonus);
             let rollflavor = `${dataset.label} Roll: ` + roll.total;
 
             if (dataset.label == "Combat" || dataset.label == "Shooting") {
@@ -151,7 +151,7 @@ export class frostgraveActorSheet extends ActorSheet {
             let roll = new Roll(`1d20+` + empowerment);
             //let roll = new Roll(`(1d20+` + empowerment + `)ms>=` + difficulty);
 
-            roll.roll();
+            roll.evaluate( { async: false});
 
             let rollresult = difficulty - roll.total;
 
diff --git a/templates/actor/partials/actor-tab-items.html b/templates/actor/partials/actor-tab-items.html
index 58f08c0..1b1e06d 100644
--- a/templates/actor/partials/actor-tab-items.html
+++ b/templates/actor/partials/actor-tab-items.html
@@ -1,7 +1,7 @@
 <div class="tab gear container is-fluid" data-group="primary" data-tab="items">
 
     {{#each gear as |item id|}}
-    <div class="box item-card my-2 py-2" data-item-id="{{item._id}}">
+    <div class="box item-card my-2 py-2" data-item-id="{{item.id}}">
         <div class="media">
             <div class="media-left">
                 <figure class="image is-square">
diff --git a/templates/actor/partials/actor-tab-spells.html b/templates/actor/partials/actor-tab-spells.html
index e36432f..76a67df 100644
--- a/templates/actor/partials/actor-tab-spells.html
+++ b/templates/actor/partials/actor-tab-spells.html
@@ -20,7 +20,7 @@
       
 
     {{#each spells as |item id|}}
-    <div class="box item-card my-2 py-2" data-item-id="{{item._id}}">
+    <div class="box item-card my-2 py-2" data-item-id="{{item.id}}">
         <div class="media">
             <div class="media-left">
                 <figure class="image is-square">