diff --git a/module/data/chat-message/actorRoll.mjs b/module/data/chat-message/actorRoll.mjs
index b0e122d1..89f34949 100644
--- a/module/data/chat-message/actorRoll.mjs
+++ b/module/data/chat-message/actorRoll.mjs
@@ -54,11 +54,14 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
     }
 
     get roll() {
-        if (this.parent.type === 'dualityRoll')
-            return this.parent.rolls.find(x => x instanceof game.system.api.dice.DualityRoll);
-
-        if (this.parent.type === 'fateRoll')
-            return this.parent.rolls.find(x => x instanceof game.system.api.dice.FateRoll);
+        switch (this.parent.type) {
+            case 'adversaryRoll':
+                return this.parent.rolls.find(x => x instanceof game.system.api.dice.D20Roll);
+            case 'dualityRoll':
+                return this.parent.rolls.find(x => x instanceof game.system.api.dice.DualityRoll);
+            case 'fateRoll':
+                return this.parent.rolls.find(x => x instanceof game.system.api.dice.FateRoll);
+        }
 
         return null;
     }
diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs
index 94f70e68..d41d2d4a 100644
--- a/module/data/fields/action/damageField.mjs
+++ b/module/data/fields/action/damageField.mjs
@@ -56,7 +56,7 @@ export default class DamageField extends fields.SchemaField {
             ...config,
             roll: formulas,
             data: this.getRollData(),
-            isCritical: message?.system.roll.isCritical
+            isCritical: Boolean(message?.system.roll?.isCritical)
         };
         delete damageConfig.evaluate;
 
diff --git a/styles/less/sheets/actors/character/sidebar.less b/styles/less/sheets/actors/character/sidebar.less
index 8bbede76..e7027163 100644
--- a/styles/less/sheets/actors/character/sidebar.less
+++ b/styles/less/sheets/actors/character/sidebar.less
@@ -305,6 +305,7 @@
                 position: relative;
                 width: 95px;
                 height: 30px;
+                white-space: nowrap;
 
                 .status-label {
                     padding: 2px 2px;
diff --git a/system.json b/system.json
index cc322576..b1fe74d8 100644
--- a/system.json
+++ b/system.json
@@ -4,8 +4,8 @@
     "description": "An unofficial implementation of the Daggerheart system",
     "version": "2.0.0",
     "compatibility": {
-        "minimum": "14.355",
-        "verified": "14.358",
+        "minimum": "14.359",
+        "verified": "14.359",
         "maximum": "14"
     },
     "authors": [