diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index bdb0e23de4..b9f6302909 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -71,9 +71,12 @@ void ESM::CellRef::load (ESMReader& esm, bool wideRefNum)
         esm.getHT (mNam0);
 }
 
-void ESM::CellRef::save(ESMWriter &esm) const
+void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum) const
 {
-    esm.writeHNT("FRMR", mRefNum.mIndex);
+    if (wideRefNum)
+        esm.writeHNT ("FRMR", mRefNum, 8);
+    else
+        esm.writeHNT ("FRMR", mRefNum.mIndex, 4);
 
     esm.writeHNCString("NAME", mRefID);
 
diff --git a/components/esm/cellref.hpp b/components/esm/cellref.hpp
index 3d80a51bd4..01b546d5a5 100644
--- a/components/esm/cellref.hpp
+++ b/components/esm/cellref.hpp
@@ -89,7 +89,7 @@ namespace ESM
 
             void load (ESMReader& esm, bool wideRefNum = false);
 
-            void save(ESMWriter &esm) const;
+            void save(ESMWriter &esm, bool wideRefNum = false) const;
 
             void blank();
     };
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index 649e3175df..cfd73554a7 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -230,7 +230,7 @@ bool Cell::getNextMVRF(ESMReader &esm, MovedCellRef &mref)
     {
         CellId id;
 
-        id.mPaged = (mData.mFlags & Interior);
+        id.mPaged = !(mData.mFlags & Interior);
 
         if (id.mPaged)
         {
diff --git a/components/esm/objectstate.cpp b/components/esm/objectstate.cpp
index b13b6c226f..56289acae3 100644
--- a/components/esm/objectstate.cpp
+++ b/components/esm/objectstate.cpp
@@ -27,7 +27,7 @@ void ESM::ObjectState::load (ESMReader &esm)
 
 void ESM::ObjectState::save (ESMWriter &esm) const
 {
-    mRef.save (esm);
+    mRef.save (esm, true);
 
     if (mHasLocals)
     {