diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index 03c5049..90dc6d1 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -2,14 +2,6 @@ import AwERoll from "./roll.mjs"
 import { SYSTEM } from "../config/system.mjs"
 
 export default class AwEActor extends Actor {
-  /** @override */
-  prepareData() {
-    super.prepareData()
-  }
-
-  /** @override */
-  prepareBaseData() {}
-
   /** @override */
   prepareDerivedData() {
     const actorData = this
diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs
index b8d88c8..4704af4 100644
--- a/module/documents/roll.mjs
+++ b/module/documents/roll.mjs
@@ -80,8 +80,9 @@ export default class AwERoll extends Roll {
     const attrBonus      = options.attributeBonus ?? 0
     const knowledgeBonuses = options.knowledgeBonuses ?? []
 
+    const modes = CONFIG.ChatMessage.modes ?? CONFIG.Dice.rollModes
     const rollModes = Object.fromEntries(
-      Object.entries(CONFIG.Dice.rollModes).map(([k, v]) => [k, game.i18n.localize(v.label ?? v)])
+      Object.entries(modes).map(([k, v]) => [k, game.i18n.localize(v.label ?? v)])
     )
 
     // Bonus choices: -10 to +10
diff --git a/templates/character-header.hbs b/templates/character-header.hbs
index 950f0cd..f24869d 100644
--- a/templates/character-header.hbs
+++ b/templates/character-header.hbs
@@ -21,7 +21,7 @@
       <div class="resource-values">
         {{formInput systemFields.hp.fields.value value=system.hp.value classes="hp-value"}}
         <span class="separator">/</span>
-        {{formInput systemFields.hp.fields.max value=system.hp.max disabled classes="hp-max"}}
+        {{formInput systemFields.hp.fields.max value=system.hp.max disabled=true classes="hp-max"}}
       </div>
       <div class="resource-temp">
         <label>{{localize "AWEMMY.Character.HPTemp"}}</label>