diff --git a/module/dice/d20Roll.mjs b/module/dice/d20Roll.mjs
index 49db18cb..6c1082f0 100644
--- a/module/dice/d20Roll.mjs
+++ b/module/dice/d20Roll.mjs
@@ -36,7 +36,7 @@ export default class D20Roll extends DHRoll {
     get isCritical() {
         if (!this.d20._evaluated) return;
 
-        const criticalThreshold = this.options.actionType === 'reaction' ? 20 : this.data.system.criticalThreshold;
+        const criticalThreshold = this.options.actionType === 'reaction' ? 20 : this.data.criticalThreshold;
         return this.d20.total >= criticalThreshold;
     }
 
diff --git a/templates/ui/chat/parts/roll-part.hbs b/templates/ui/chat/parts/roll-part.hbs
index 850f0e92..78f4dcd9 100644
--- a/templates/ui/chat/parts/roll-part.hbs
+++ b/templates/ui/chat/parts/roll-part.hbs
@@ -6,7 +6,7 @@
                 {{#if roll.isCritical}}
                     <span>{{localize "DAGGERHEART.GENERAL.criticalShort"}}</span>
                 {{else}}
-                    {{#if (and roll.result (not (eq roll.type "reaction")))}}
+                    {{#if (and roll.dHope (not (eq roll.type "reaction")))}}
                         <span>{{localize "DAGGERHEART.GENERAL.withThing" thing=roll.totalLabel}}</span>
                     {{/if}}
                 {{/if}}
@@ -89,7 +89,7 @@
                                 {{#each roll.dice}}
                                     {{#each results}}
                                         <div class="roll-die {{#unless (or @../first discarded)}} has-plus{{/unless}}">
-                                            <div class="dice {{../dice}}{{#if discarded}} discarded{{else}}{{#if (and @../first ../../roll.advantage.type)}}{{#if (eq ../../roll.advantage.type 1)}} color-adv{{else}} color-dis{{/if}}{{/if}}{{#if success}} color-adv{{/if}}{{/if}}">
+                                            <div class="dice {{../denomination}}{{#if discarded}} discarded{{else}}{{#if (and @../first ../../roll.advantage.type)}}{{#if (eq ../../roll.advantage.type 1)}} color-adv{{else}} color-dis{{/if}}{{/if}}{{#if success}} color-adv{{/if}}{{/if}}">
                                                 {{result}}
                                             </div>
                                         </div>