diff --git a/components/esm3/cellid.cpp b/components/esm3/cellid.cpp
index 1c9382f546..3df1336c6c 100644
--- a/components/esm3/cellid.cpp
+++ b/components/esm3/cellid.cpp
@@ -13,7 +13,7 @@ namespace ESM
 
         if (esm.isNextSub("CIDX"))
         {
-            esm.getHTSized<8>(mIndex);
+            esm.getHT(mIndex.mX, mIndex.mY);
             mPaged = true;
         }
         else
diff --git a/components/esm3/cellid.hpp b/components/esm3/cellid.hpp
index eeedc5f554..3efb49b58e 100644
--- a/components/esm3/cellid.hpp
+++ b/components/esm3/cellid.hpp
@@ -2,6 +2,7 @@
 #define OPENMW_ESM_CELLID_H
 
 #include <components/esm/refid.hpp>
+#include <cstdint>
 #include <string>
 
 namespace ESM
@@ -13,8 +14,8 @@ namespace ESM
     {
         struct CellIndex
         {
-            int mX;
-            int mY;
+            int32_t mX;
+            int32_t mY;
         };
 
         std::string mWorldspace;
diff --git a/components/esm3/cellref.cpp b/components/esm3/cellref.cpp
index 2944a17db4..c4c2fca986 100644
--- a/components/esm3/cellref.cpp
+++ b/components/esm3/cellref.cpp
@@ -112,7 +112,7 @@ namespace ESM
                     case fourCC("DODT"):
                         if constexpr (load)
                         {
-                            esm.getHTSized<24>(cellRef.mDoorDest);
+                            esm.getHT(cellRef.mDoorDest.pos, cellRef.mDoorDest.rot);
                             cellRef.mTeleport = true;
                         }
                         else
@@ -132,7 +132,7 @@ namespace ESM
                         break;
                     case fourCC("DATA"):
                         if constexpr (load)
-                            esm.getHTSized<24>(cellRef.mPos);
+                            esm.getHT(cellRef.mPos.pos, cellRef.mPos.rot);
                         else
                             esm.skipHTSized<24, decltype(cellRef.mPos)>();
                         break;
diff --git a/components/esm3/cellref.hpp b/components/esm3/cellref.hpp
index 53f40ffab7..10ab4505ce 100644
--- a/components/esm3/cellref.hpp
+++ b/components/esm3/cellref.hpp
@@ -1,6 +1,7 @@
 #ifndef OPENMW_ESM_CELLREF_H
 #define OPENMW_ESM_CELLREF_H
 
+#include <cstdint>
 #include <string>
 
 #include "components/esm/defs.hpp"
@@ -48,7 +49,7 @@ namespace ESM
         ESM::RefId mFaction;
 
         // PC faction rank required to use the item. Sometimes is -1, which means "any rank".
-        int mFactionRank;
+        int32_t mFactionRank;
 
         // For weapon or armor, this is the remaining item health.
         // For tools (lockpicks, probes, repair hammer) it is the remaining uses.
@@ -56,7 +57,7 @@ namespace ESM
         // This could be -1 if the charge was not touched yet (i.e. full).
         union
         {
-            int mChargeInt; // Used by everything except lights
+            int32_t mChargeInt; // Used by everything except lights
             float mChargeFloat; // Used only by lights
         };
         float mChargeIntRemainder; // Stores amount of charge not subtracted from mChargeInt
@@ -65,7 +66,7 @@ namespace ESM
         float mEnchantmentCharge;
 
         // This is 5 for Gold_005 references, 100 for Gold_100 and so on.
-        int mGoldValue;
+        int32_t mGoldValue;
 
         // For doors - true if this door teleports to somewhere else, false
         // if it should open through animation.
@@ -78,7 +79,7 @@ namespace ESM
         std::string mDestCell;
 
         // Lock level for doors and containers
-        int mLockLevel;
+        int32_t mLockLevel;
         bool mIsLocked{};
         ESM::RefId mKey, mTrap; // Key and trap ID names, if any