diff --git a/module/actor/entity.js b/module/actor/entity.js
index 0b85921b..c2e75b3a 100644
--- a/module/actor/entity.js
+++ b/module/actor/entity.js
@@ -549,7 +549,7 @@ export default class Actor5e extends Actor {
   async createOwnedItem(itemData, options) {
 
     // Assume NPCs are always proficient with weapons and always have powers prepared
-    if ( !this.isPC ) {
+    if ( !this.hasPlayerOwner ) {
       let t = itemData.type;
       let initial = {};
       if ( t === "weapon" ) initial["data.proficient"] = true;
diff --git a/module/apps/trait-selector.js b/module/apps/trait-selector.js
index a4fc43d7..b3af60d0 100644
--- a/module/apps/trait-selector.js
+++ b/module/apps/trait-selector.js
@@ -1,6 +1,6 @@
 /**
  * A specialized form used to select from a checklist of attributes, traits, or properties
- * @extends {FormApplication}
+ * @implements {FormApplication}
  */
 export default class TraitSelector extends FormApplication {
 
@@ -36,7 +36,7 @@ export default class TraitSelector extends FormApplication {
   getData() {
 
     // Get current values
-    let attr = getProperty(this.object.data, this.attribute) || {};
+    let attr = getProperty(this.object._data, this.attribute) || {};
     attr.value = attr.value || [];
 
 	  // Populate choices