diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 56b46d856..833353174 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -169,8 +169,8 @@ void ESMStore::validate()
             if (!fact)
             {
                 Log(Debug::Verbose) << "NPC '" << npc.mId << "' (" << npc.mName << ") has nonexistent faction '" << npc.mFaction << "', ignoring it.";
-                npc.mFaction = "";
-                npc.mNpdt.mRank = -1;
+                npc.mFaction.clear();
+                npc.mNpdt.mRank = 0;
                 changed = true;
             }
         }
diff --git a/components/esm/loadclot.hpp b/components/esm/loadclot.hpp
index a9ea3e70a..4db791c0c 100644
--- a/components/esm/loadclot.hpp
+++ b/components/esm/loadclot.hpp
@@ -40,7 +40,7 @@ struct Clothing
         int mType;
         float mWeight;
         unsigned short mValue;
-        short mEnchant;
+        unsigned short mEnchant;
     };
     CTDTstruct mData;
 
diff --git a/components/esm/loadweap.hpp b/components/esm/loadweap.hpp
index 8b48b71b7..dfe2b695a 100644
--- a/components/esm/loadweap.hpp
+++ b/components/esm/loadweap.hpp
@@ -59,7 +59,7 @@ struct Weapon
         short mType;
         unsigned short mHealth;
         float mSpeed, mReach;
-        short mEnchant; // Enchantment points. The real value is mEnchant/10.f
+        unsigned short mEnchant; // Enchantment points. The real value is mEnchant/10.f
         unsigned char mChop[2], mSlash[2], mThrust[2]; // Min and max
         int mFlags;
     }; // 32 bytes