diff --git a/module/actor-sheet.js b/module/actor-sheet.js
index 0537ef1..cefbf9a 100644
--- a/module/actor-sheet.js
+++ b/module/actor-sheet.js
@@ -134,12 +134,12 @@ export class SoSActorSheet extends ActorSheet {
     });
     html.find('.skill-label a').click((event) => {
       const li = $(event.currentTarget).parents(".item");
-      const skill = this.actor.get.items(li.data("item-id"));
+      const skill = this.actor.items.get(li.data("item-id"));
       this.actor.rollSkill(skill);
     });
     html.find('.weapon-label a').click((event) => {
       const li = $(event.currentTarget).parents(".item");
-      const weapon = this.actor.get.items(li.data("item-id"));
+      const weapon = this.actor.items.get(li.data("item-id"));
       this.actor.rollWeapon(weapon);
     });
     html.find('.skill-value').change((event) => {
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index 326846b..290a7d1 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -236,7 +236,7 @@
               <img class="sheet-skill-img" src="{{weapon.img}}"/>
               <span class="weapon-label"><a>{{weapon.name}}</a></span>
               <div class="item-controls">
-                <a class="item-control item-equip" title="Equipped">{{#if weapon.data.equiped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-equip" title="Equipped">{{#if weapon.data.data.equiped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
                 <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
diff --git a/templates/item-armor-sheet.html b/templates/item-armor-sheet.html
index 556c6c0..49b68c2 100644
--- a/templates/item-armor-sheet.html
+++ b/templates/item-armor-sheet.html
@@ -1,8 +1,8 @@
 <form class="{{cssClass}}" autocomplete="off">
     <header class="sheet-header">
-        <img class="profile-img" src="{{data..img}}" data-edit="img" title="{{data..name}}"/>
+        <img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}"/>
         <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{data..name}}" placeholder="Name"/></h1>
+            <h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name"/></h1>
         </div>
     </header>
 
diff --git a/templates/item-commongear-sheet.html b/templates/item-commongear-sheet.html
index d122999..09167c7 100644
--- a/templates/item-commongear-sheet.html
+++ b/templates/item-commongear-sheet.html
@@ -43,10 +43,11 @@
     <label class="generic-label">Worn ?</label>
     <label class="attribute-value checkbox"><input type="checkbox" name="data.worn" {{checked data.worn}}/></label>
   </div>
+  {{/with}}
+
   <div class="flexcol">
     <label class="generic-label">Description</label>
     <div class="form-group medium-editor">
-      {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+      {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
     </div>
   </div>
-{{/with}}