diff --git a/module/applications/ui/combatTracker.mjs b/module/applications/ui/combatTracker.mjs
index 69c43b61..85c77cd3 100644
--- a/module/applications/ui/combatTracker.mjs
+++ b/module/applications/ui/combatTracker.mjs
@@ -43,11 +43,6 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
         });
     }
 
-    async _prepareTurnContext(combat, combatant, index) {
-        const turn = await super._prepareTurnContext(combat, combatant, index);
-        return { ...turn, isNPC: combatant.isNPC, system: combatant.system.toObject() };
-    }
-
     _getCombatContextOptions() {
         return [
             {
@@ -113,7 +108,7 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
             tooltip: this._formatEffectsTooltip(effects)
         };
 
-        return turn;
+        return { ...turn, isNPC: combatant.isNPC, system: combatant.system.toObject() };
     }
 
     async setCombatantSpotlight(combatantId) {
diff --git a/module/data/fields/actionField.mjs b/module/data/fields/actionField.mjs
index dc567da9..a8b01e37 100644
--- a/module/data/fields/actionField.mjs
+++ b/module/data/fields/actionField.mjs
@@ -102,6 +102,7 @@ export class ActionField extends foundry.data.fields.ObjectField {
 
     /** @override */
     initialize(value, model, options = {}) {
+        if(value && !value.type) value.type = 'attack';
         const cls = this.getModel(value);
         if (cls) return new cls(value, { parent: model, ...options });
         return foundry.utils.deepClone(value);