diff --git a/module/systemRegistration/migrations.mjs b/module/systemRegistration/migrations.mjs
index c2c53f4e..2851f7d4 100644
--- a/module/systemRegistration/migrations.mjs
+++ b/module/systemRegistration/migrations.mjs
@@ -345,7 +345,7 @@ export async function runMigrations() {
 
     if (foundry.utils.isNewerVersion('2.0.4', lastMigrationVersion)) {
         const downtimeMoves = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew);
-        if (downtimeMoves.restMoves.longRest.moves.repairArmor) {
+        if (restMoves.longRest.moves.repairArmor) {
             await downtimeMoves.updateSource({
                 'restMoves.longRest.moves.repairArmor': defaultRestOptions.longRest().repairArmor
             });
diff --git a/templates/ui/chat/parts/damage-part.hbs b/templates/ui/chat/parts/damage-part.hbs
index 45b09b72..02519a86 100644
--- a/templates/ui/chat/parts/damage-part.hbs
+++ b/templates/ui/chat/parts/damage-part.hbs
@@ -33,32 +33,31 @@
                                 <div class="roll-formula">{{total}}</div></span></label>
                             {{/if}}
                             <div class="roll-dice">
-                                {{#if dice.length}}
-                                    {{#each dice}}
-                                        {{#each results}}
-                                            {{#unless discarded}}
-                                                <div class="roll-die{{#unless @../first}} has-plus{{/unless}}">
-                                                    <div 
-                                                        class="dice reroll-button {{../dice}}" 
-                                                        data-die-index="0" data-type="damage" data-damage-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
-                                                    >
-                                                        {{#if hasRerolls}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "DAGGERHEART.GENERAL.rerolled"}}"></i>{{/if}}
-                                                        {{result}}
-                                                    </div>
+                                {{#each dice}}
+                                    {{#each results}}
+                                        {{#unless discarded}}
+                                            <div class="roll-die{{#unless @../first}} has-plus{{/unless}}">
+                                                <div 
+                                                    class="dice reroll-button {{../dice}}" 
+                                                    data-die-index="0" data-type="damage" data-damage-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
+                                                >
+                                                    {{#if hasRerolls}}<i class="fa-solid fa-dice dice-rerolled" data-tooltip="{{localize "DAGGERHEART.GENERAL.rerolled"}}"></i>{{/if}}
+                                                    {{result}}
                                                 </div>
-                                            {{/unless}}
-                                        {{/each}}
+                                            </div>
+                                        {{/unless}}
                                     {{/each}}
-                                    {{#if modifierTotal}}
-                                        <div class="roll-die{{#if (gt modifierTotal 0)}} has-plus{{/if}}">
-                                            <div class="font-20">{{modifierTotal}}</div>
-                                        </div>
-                                    {{/if}}
-                                {{else}}
+                                {{/each}}
+                                {{#if modifierTotal}}
+                                    <div class="roll-die{{#if (gt modifierTotal 0)}} has-plus{{/if}}">
+                                        <div class="font-20">{{modifierTotal}}</div>
+                                    </div>
+                                {{/if}}
+                                {{#unless dice.length}}
                                     <div class="roll-die">
                                         <div class="font-20">{{total}}</div>
                                     </div>
-                                {{/if}}
+                                {{/unless}}
                             </div>
                         {{/each}}
                     </fieldset>