diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index 58be672b..f3008704 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -451,15 +451,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
 
     static migrateData(source) {
         if (source.damage?.parts && Array.isArray(source.damage.parts)) {
-            let hitPointsExists = source.damage.parts.some(x => x.applyTo === 'hitPoints');
             source.damage.parts = source.damage.parts.reduce((acc, part) => {
-                if (!part.applyTo && hitPointsExists) return acc;
-
-                if (!part.applyTo) {
-                    hitPointsExists = true;
-                    part.applyTo = 'hitPoints';
-                }
-
                 acc[part.applyTo] = part;
                 return acc;
             }, {});
diff --git a/module/data/actor/adversary.mjs b/module/data/actor/adversary.mjs
index ae17c128..d6d0dcdf 100644
--- a/module/data/actor/adversary.mjs
+++ b/module/data/actor/adversary.mjs
@@ -87,7 +87,6 @@ export default class DhpAdversary extends DhCreature {
                         parts: {
                             hitPoints: {
                                 type: ['physical'],
-                                applyTo: 'hitPoints',
                                 value: {
                                     multiplier: 'flat'
                                 }
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index b39c64aa..3b12da6f 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -107,7 +107,6 @@ export default class DhCharacter extends DhCreature {
                         parts: {
                             hitPoints: {
                                 type: ['physical'],
-                                applyTo: 'hitPoints',
                                 value: {
                                     custom: {
                                         enabled: true,
diff --git a/module/data/actor/companion.mjs b/module/data/actor/companion.mjs
index 2ca7fd5b..300bd698 100644
--- a/module/data/actor/companion.mjs
+++ b/module/data/actor/companion.mjs
@@ -102,7 +102,6 @@ export default class DhCompanion extends DhCreature {
                         parts: {
                             hitPoints: {
                                 type: ['physical'],
-                                applyTo: 'hitPoints',
                                 value: {
                                     dice: 'd6',
                                     multiplier: 'prof'
diff --git a/module/data/countdowns.mjs b/module/data/countdowns.mjs
index ffe4d26b..8e55ed31 100644
--- a/module/data/countdowns.mjs
+++ b/module/data/countdowns.mjs
@@ -28,39 +28,6 @@ export default class DhCountdowns extends foundry.abstract.DataModel {
         for (const countdownKey of changedCountdowns)
             foundry.ui.countdowns.changedCountdownsForAnimation.add(countdownKey);
     }
-
-    static migrateData(source) {
-        const migrateOldCountdowns = (data, type) => {
-            for (const key of Object.keys(data.countdowns)) {
-                const countdown = data.countdowns[key];
-                source.countdowns[key] = {
-                    ...countdown,
-                    type: type,
-                    ownership: Object.keys(countdown.ownership.players).reduce((acc, key) => {
-                        acc[key] =
-                            countdown.ownership.players[key].type === 1 ? 2 : countdown.ownership.players[key].type;
-                        return acc;
-                    }, {}),
-                    progress: {
-                        ...countdown.progress,
-                        type: countdown.progress.type.value
-                    }
-                };
-            }
-
-            source[type] = null;
-        };
-
-        if (source.narrative) {
-            migrateOldCountdowns(source.narrative, 'narrative');
-        }
-
-        if (source.encounter) {
-            migrateOldCountdowns(source.encounter, 'encounter');
-        }
-
-        return super.migrateData(source);
-    }
 }
 
 export class DhCountdown extends foundry.abstract.DataModel {
diff --git a/module/systemRegistration/migrations.mjs b/module/systemRegistration/migrations.mjs
index 6971c34c..ec546c92 100644
--- a/module/systemRegistration/migrations.mjs
+++ b/module/systemRegistration/migrations.mjs
@@ -1,4 +1,5 @@
 import { defaultRestOptions } from '../config/generalConfig.mjs';
+import { RefreshType, socketEvent } from './socket.mjs';
 
 export async function runMigrations() {
     let lastMigrationVersion = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LastMigrationVersion);
@@ -152,26 +153,61 @@ export async function runMigrations() {
             await pack.configure({ locked: true });
         }
 
+        /* Migrate old countdown structure */
+        const countdownSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
+        const getCountdowns = (data, type) => {
+            return Object.keys(data.countdowns).reduce((acc, key) => {
+                const countdown = data.countdowns[key];
+                acc[key] = {
+                    ...countdown,
+                    type: type,
+                    ownership: Object.keys(countdown.ownership.players).reduce((acc, key) => {
+                        acc[key] =
+                            countdown.ownership.players[key].type === 1 ? 2 : countdown.ownership.players[key].type;
+                        return acc;
+                    }, {}),
+                    progress: {
+                        ...countdown.progress,
+                        type: countdown.progress.type.value
+                    }
+                };
+
+                return acc;
+            }, {});
+        };
+
+        await countdownSettings.updateSource({
+            countdowns: {
+                ...getCountdowns(countdownSettings.narrative, 'narrative'),
+                ...getCountdowns(countdownSettings.encounter, 'encounter')
+            }
+        });
+        await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns, countdownSettings);
+
+        game.socket.emit(`system.${CONFIG.DH.id}`, {
+            action: socketEvent.Refresh,
+            data: { refreshType: RefreshType.Countdown }
+        });
+        Hooks.callAll(socketEvent.Refresh, { refreshType: RefreshType.Countdown });
+
         lastMigrationVersion = '1.2.0';
     }
 
     if (foundry.utils.isNewerVersion('1.2.7', lastMigrationVersion)) {
-        try {
-            const tagTeam = game.settings.get(CONFIG.DH.id, 'TagTeamRoll');
-            const initatorMissing = tagTeam.initiator && !game.actors.some(actor => actor.id === tagTeam.initiator);
-            const missingMembers = Object.keys(tagTeam.members).reduce((acc, id) => {
-                if (!game.actors.some(actor => actor.id === id)) {
-                    acc[id] = _del;
-                }
-                return acc;
-            }, {});
+        const tagTeam = game.settings.get(CONFIG.DH.id, 'TagTeamRoll');
+        const initatorMissing = tagTeam.initiator && !game.actors.some(actor => actor.id === tagTeam.initiator);
+        const missingMembers = Object.keys(tagTeam.members).reduce((acc, id) => {
+            if (!game.actors.some(actor => actor.id === id)) {
+                acc[id] = _del;
+            }
+            return acc;
+        }, {});
 
-            await tagTeam.updateSource({
-                initiator: initatorMissing ? null : tagTeam.initiator,
-                members: missingMembers
-            });
-            await game.settings.set(CONFIG.DH.id, 'TagTeamRoll', tagTeam);
-        } catch { }
+        await tagTeam.updateSource({
+            initiator: initatorMissing ? null : tagTeam.initiator,
+            members: missingMembers
+        });
+        await game.settings.set(CONFIG.DH.id, 'TagTeamRoll', tagTeam);
 
         lastMigrationVersion = '1.2.7';
     }
@@ -267,8 +303,6 @@ export async function runMigrations() {
 
         /* Migrate existing effects modifying armor, creating new Armor Effects instead */
         const migrateEffects = async entity => {
-            if (!entity?.effects) return;
-
             for (const effect of entity.effects) {
                 if (effect.system.changes.every(x => x.key !== 'system.armorScore')) continue;
 
diff --git a/system.json b/system.json
index 0ecc2e75..4660a196 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "2.4.2",
+    "version": "2.4.1",
     "compatibility": {
         "minimum": "14.364",
         "verified": "14.364",
@@ -10,7 +10,7 @@
     },
     "url": "https://github.com/Foundryborne/daggerheart",
     "manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/v14/system.json",
-    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.4.2/system.zip",
+    "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.4.1/system.zip",
     "authors": [
         {
             "name": "WBHarry"