diff --git a/module/data/actor/adversary.mjs b/module/data/actor/adversary.mjs
index 5ad855ed..5b83f3c7 100644
--- a/module/data/actor/adversary.mjs
+++ b/module/data/actor/adversary.mjs
@@ -144,7 +144,7 @@ export default class DhpAdversary extends BaseDataActor {
         super._onUpdate(changes, options, userId);
 
         if (game.user.id === userId) {
-            if (changes.system.type) {
+            if (changes.system?.type) {
                 const existingHordeEffect = this.parent.effects.find(x => x.type === 'horde');
                 if (changes.system.type === CONFIG.DH.ACTOR.adversaryTypes.horde.id) {
                     if (!existingHordeEffect)
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index 83311c96..f9f6e161 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -579,7 +579,7 @@ export default class DhCharacter extends BaseDataActor {
                 : this.levelData.level.current * 2
         };
         this.resources.hope.max -= Object.keys(this.scars).length;
-        this.resources.hitPoints.max = this.class.value?.system?.hitPoints ?? 0;
+        this.resources.hitPoints.max += this.class.value?.system?.hitPoints ?? 0;
     }
 
     prepareDerivedData() {
diff --git a/templates/sheets/actors/adversary/header.hbs b/templates/sheets/actors/adversary/header.hbs
index 7adc1583..d1c325f6 100644
--- a/templates/sheets/actors/adversary/header.hbs
+++ b/templates/sheets/actors/adversary/header.hbs
@@ -36,7 +36,7 @@
 
     <div class="adversary-navigation">
         {{> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
-        <button data-action="openSettings" data-tooltip-text="{{localize "DAGGERHEART.UI.Tooltip.openSheetSettings"}}">
+        <button type="button" data-action="openSettings" data-tooltip-text="{{localize "DAGGERHEART.UI.Tooltip.openSheetSettings"}}">
             <i class="fa-solid fa-wrench"></i>
         </button>
     </div>
diff --git a/templates/sheets/actors/adversary/sidebar.hbs b/templates/sheets/actors/adversary/sidebar.hbs
index 55f8395e..1b6d65a5 100644
--- a/templates/sheets/actors/adversary/sidebar.hbs
+++ b/templates/sheets/actors/adversary/sidebar.hbs
@@ -114,6 +114,6 @@
     </div>
     <line-div></line-div>
     <div class="reaction-section">
-        <button data-action="reactionRoll">{{localize "DAGGERHEART.GENERAL.Roll.reaction"}}</button>
+        <button type="button" data-action="reactionRoll">{{localize "DAGGERHEART.GENERAL.Roll.reaction"}}</button>
     </div>
 </aside>
\ No newline at end of file