diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index 2160a04b1b..4950e3edf4 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -164,8 +164,10 @@ namespace MWGui
         const MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats(player);
 
         setClassImage(mClassImage,
-            ESM::RefId::stringRefId(getLevelupClassImage(pcStats.getSkillIncreasesForSpecialization(0),
-                pcStats.getSkillIncreasesForSpecialization(1), pcStats.getSkillIncreasesForSpecialization(2))));
+            ESM::RefId::stringRefId(
+                getLevelupClassImage(pcStats.getSkillIncreasesForSpecialization(ESM::Class::Specialization::Combat),
+                    pcStats.getSkillIncreasesForSpecialization(ESM::Class::Specialization::Magic),
+                    pcStats.getSkillIncreasesForSpecialization(ESM::Class::Specialization::Stealth))));
 
         int level = creatureStats.getLevel() + 1;
         mLevelText->setCaptionWithReplacing("#{sLevelUpMenu1} " + MyGUI::utility::toString(level));
diff --git a/apps/openmw/mwlua/stats.cpp b/apps/openmw/mwlua/stats.cpp
index 224fdba0f2..4257a90e84 100644
--- a/apps/openmw/mwlua/stats.cpp
+++ b/apps/openmw/mwlua/stats.cpp
@@ -89,7 +89,8 @@ namespace MWLua
             stats.setSkillIncreasesForAttribute(
                 *std::get<ESM::RefId>(index).getIf<ESM::StringRefId>(), LuaUtil::cast<int>(value));
         else if (prop == "skillIncreasesForSpecialization")
-            stats.setSkillIncreasesForSpecialization(std::get<int>(index), LuaUtil::cast<int>(value));
+            stats.setSkillIncreasesForSpecialization(
+                static_cast<ESM::Class::Specialization>(std::get<int>(index)), LuaUtil::cast<int>(value));
     }
 
     class SkillIncreasesForAttributeStats
@@ -144,7 +145,8 @@ namespace MWLua
 
             return getValue(context, mObject, &setNpcValue, specialization, "skillIncreasesForSpecialization",
                 [specialization](const MWWorld::Ptr& ptr) {
-                    return ptr.getClass().getNpcStats(ptr).getSkillIncreasesForSpecialization(specialization);
+                    return ptr.getClass().getNpcStats(ptr).getSkillIncreasesForSpecialization(
+                        static_cast<ESM::Class::Specialization>(specialization));
                 });
         }
 
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 046c94fc8f..2c7a710355 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -365,12 +365,12 @@ void MWMechanics::NpcStats::setSkillIncreasesForAttribute(ESM::Attribute::Attrib
         mSkillIncreases[attribute] = increases;
 }
 
-int MWMechanics::NpcStats::getSkillIncreasesForSpecialization(int spec) const
+int MWMechanics::NpcStats::getSkillIncreasesForSpecialization(ESM::Class::Specialization spec) const
 {
     return mSpecIncreases[spec];
 }
 
-void MWMechanics::NpcStats::setSkillIncreasesForSpecialization(int spec, int increases)
+void MWMechanics::NpcStats::setSkillIncreasesForSpecialization(ESM::Class::Specialization spec, int increases)
 {
     assert(spec >= 0 && spec < 3);
     mSpecIncreases[spec] = increases;
diff --git a/apps/openmw/mwmechanics/npcstats.hpp b/apps/openmw/mwmechanics/npcstats.hpp
index 9695d45ac4..0104153a38 100644
--- a/apps/openmw/mwmechanics/npcstats.hpp
+++ b/apps/openmw/mwmechanics/npcstats.hpp
@@ -3,6 +3,7 @@
 
 #include "creaturestats.hpp"
 #include <components/esm/refid.hpp>
+#include <components/esm3/loadclas.hpp>
 #include <components/esm3/loadskil.hpp>
 #include <map>
 #include <set>
@@ -98,8 +99,8 @@ namespace MWMechanics
         int getSkillIncreasesForAttribute(ESM::Attribute::AttributeID attribute) const;
         void setSkillIncreasesForAttribute(ESM::Attribute::AttributeID, int increases);
 
-        int getSkillIncreasesForSpecialization(int spec) const;
-        void setSkillIncreasesForSpecialization(int spec, int increases);
+        int getSkillIncreasesForSpecialization(ESM::Class::Specialization spec) const;
+        void setSkillIncreasesForSpecialization(ESM::Class::Specialization spec, int increases);
 
         void levelUp();