diff --git a/LEGO1/legogamestate.cpp b/LEGO1/legogamestate.cpp
index 66873f12..c12a5e06 100644
--- a/LEGO1/legogamestate.cpp
+++ b/LEGO1/legogamestate.cpp
@@ -27,13 +27,13 @@ MxResult LegoGameState::Save(MxULong p)
 }
 
 // OFFSET: LEGO1 0x1003a2e0
-void LegoGameState::SerializePlayersInfo(short p)
+void LegoGameState::SerializePlayersInfo(MxS16 p)
 {
   // TODO
 }
 
 // OFFSET: LEGO1 0x1003cdd0
-void LegoGameState::SerializeScoreHistory(short p)
+void LegoGameState::SerializeScoreHistory(MxS16 p)
 {
   // TODO
 }
diff --git a/LEGO1/legogamestate.h b/LEGO1/legogamestate.h
index fdd5bcb1..80437051 100644
--- a/LEGO1/legogamestate.h
+++ b/LEGO1/legogamestate.h
@@ -10,8 +10,8 @@ class LegoGameState
   __declspec(dllexport) ~LegoGameState();
   __declspec(dllexport) MxResult Load(MxULong);
   __declspec(dllexport) MxResult Save(MxULong p);
-  __declspec(dllexport) void SerializePlayersInfo(short p);
-  __declspec(dllexport) void SerializeScoreHistory(short p);
+  __declspec(dllexport) void SerializePlayersInfo(MxS16 p);
+  __declspec(dllexport) void SerializeScoreHistory(MxS16 p);
   __declspec(dllexport) void SetSavePath(char *p);
 };
 
diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp
index 32fb4d7f..b5cbca8e 100644
--- a/LEGO1/legoomni.cpp
+++ b/LEGO1/legoomni.cpp
@@ -112,7 +112,7 @@ MxBackgroundAudioManager *BackgroundAudioManager()
 }
 
 // OFFSET: LEGO1 0x100c0280 STUB
-MxDSObject *CreateStreamObject(MxDSFile *,short)
+MxDSObject *CreateStreamObject(MxDSFile *,MxS16)
 {
   // TODO
   return NULL;
diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h
index 9c8df71f..0ba27cf2 100644
--- a/LEGO1/legoomni.h
+++ b/LEGO1/legoomni.h
@@ -95,7 +95,7 @@ class LegoOmni : public MxOmni
 };
 
 __declspec(dllexport) MxBackgroundAudioManager * BackgroundAudioManager();
-__declspec(dllexport) MxDSObject * CreateStreamObject(MxDSFile *,short);
+__declspec(dllexport) MxDSObject * CreateStreamObject(MxDSFile *,MxS16);
 __declspec(dllexport) LegoGameState * GameState();
 __declspec(dllexport) const char * GetNoCD_SourceName();
 __declspec(dllexport) LegoInputManager * InputManager();
diff --git a/LEGO1/mxdsfile.h b/LEGO1/mxdsfile.h
index ae44ff46..ac812df7 100644
--- a/LEGO1/mxdsfile.h
+++ b/LEGO1/mxdsfile.h
@@ -41,11 +41,11 @@ class MxDSFile : public MxDSSource
       , streamBuffersNum(0)
     {}
 
-    unsigned short majorVersion;
-    unsigned short minorVersion;
+    MxU16 majorVersion;
+    MxU16 minorVersion;
     MxULong bufferSize;
-    short streamBuffersNum;
-    short reserved;
+    MxS16 streamBuffersNum;
+    MxS16 reserved;
   };
 
   MxString m_filename;
diff --git a/LEGO1/mxdsobject.cpp b/LEGO1/mxdsobject.cpp
index 66b1ed6c..abe8902f 100644
--- a/LEGO1/mxdsobject.cpp
+++ b/LEGO1/mxdsobject.cpp
@@ -111,7 +111,7 @@ unsigned int MxDSObject::CalculateUnk08()
 }
 
 // OFFSET: LEGO1 0x100bfa20
-void MxDSObject::Parse(char **p_source, unsigned short p_unk24)
+void MxDSObject::Parse(char **p_source, MxU16 p_unk24)
 {
   this->SetSourceName(*p_source);
   *p_source += strlen(this->m_sourceName) + 1;
diff --git a/LEGO1/mxdsobject.h b/LEGO1/mxdsobject.h
index ef4701bc..ff7d4a02 100644
--- a/LEGO1/mxdsobject.h
+++ b/LEGO1/mxdsobject.h
@@ -25,7 +25,7 @@ class MxDSObject : public MxCore
 
   virtual int unk14(); // vtable+14;
   virtual unsigned int CalculateUnk08(); // vtable+18;
-  virtual void Parse(char **p_source, unsigned short p_unk24); // vtable+1c;
+  virtual void Parse(char **p_source, MxU16 p_unk24); // vtable+1c;
 
   void SetSourceName(const char *p_sourceName);
 
@@ -33,7 +33,7 @@ class MxDSObject : public MxCore
   inline int GetUnknown1c() { return this->m_unk1c; }
 
   inline void SetUnknown1c(int p_unk1c) { this->m_unk1c = p_unk1c; }
-  inline void SetUnknown24(short p_unk24) { this->m_unk24 = p_unk24; }
+  inline void SetUnknown24(MxS16 p_unk24) { this->m_unk24 = p_unk24; }
 
   // OFFSET: ISLE 0x401c40
   // OFFSET: LEGO1 0x10005530
@@ -41,14 +41,14 @@ class MxDSObject : public MxCore
 
 private:
   unsigned int m_unk08;
-  short m_unk0c;
+  MxS16 m_unk0c;
   char* m_sourceName;
   int m_unk14;
   char *m_objectName;
   int m_unk1c;
   MxAtomId m_atomId;
-  short m_unk24;
-  unsigned short m_unk26;
+  MxS16 m_unk24;
+  MxU16 m_unk26;
   int m_unk28;
 };
 
diff --git a/LEGO1/mxioinfo.cpp b/LEGO1/mxioinfo.cpp
index d95a00ef..2d55ef36 100644
--- a/LEGO1/mxioinfo.cpp
+++ b/LEGO1/mxioinfo.cpp
@@ -13,7 +13,7 @@ MXIOINFO::~MXIOINFO()
 }
 
 // OFFSET: LEGO1 0x100cc830
-unsigned short MXIOINFO::Open(const char *filename, DWORD fdwOpen)
+MxU16 MXIOINFO::Open(const char *filename, DWORD fdwOpen)
 {
   return 0;
 }
@@ -43,7 +43,7 @@ void MXIOINFO::SetBuffer(LPSTR pchBuffer, LONG cchBuffer, LONG unk)
 }
 
 // OFFSET: LEGO1 0x100cce60
-unsigned short MXIOINFO::Descend(LPMMCKINFO pmmcki, const MMCKINFO *pmmckiParent, UINT fuDescend)
+MxU16 MXIOINFO::Descend(LPMMCKINFO pmmcki, const MMCKINFO *pmmckiParent, UINT fuDescend)
 {
   return 0;
-}
\ No newline at end of file
+}
diff --git a/LEGO1/mxioinfo.h b/LEGO1/mxioinfo.h
index 9556e5df..5ce0947a 100644
--- a/LEGO1/mxioinfo.h
+++ b/LEGO1/mxioinfo.h
@@ -12,12 +12,12 @@ class MXIOINFO
   MXIOINFO();
   __declspec(dllexport) ~MXIOINFO();
 
-  unsigned short Open(const char *filename, DWORD fdwOpen);
+  MxU16 Open(const char *filename, DWORD fdwOpen);
   void Close(MxLong arg);
   LONG Seek(LONG lOffset, int iOrigin);
   MxULong Read(HPSTR pch, LONG cch);
   void SetBuffer(LPSTR pchBuffer, LONG cchBuffer, LONG unk);
-  unsigned short Descend(LPMMCKINFO pmmcki, const MMCKINFO *pmmckiParent, UINT fuDescend);
+  MxU16 Descend(LPMMCKINFO pmmcki, const MMCKINFO *pmmckiParent, UINT fuDescend);
 
   MMIOINFO m_info;
 };
diff --git a/LEGO1/mxstreamer.cpp b/LEGO1/mxstreamer.cpp
index 3f377151..12f51f99 100644
--- a/LEGO1/mxstreamer.cpp
+++ b/LEGO1/mxstreamer.cpp
@@ -7,7 +7,7 @@ MxStreamer::~MxStreamer()
 }
 
 // OFFSET: LEGO1 0x100b92c0 STUB
-MxStreamController *MxStreamer::Open(const char *name, unsigned short p)
+MxStreamController *MxStreamer::Open(const char *name, MxU16 p)
 {
   // TODO
   return NULL;
diff --git a/LEGO1/mxstreamer.h b/LEGO1/mxstreamer.h
index 36f1a30f..f14ac66d 100644
--- a/LEGO1/mxstreamer.h
+++ b/LEGO1/mxstreamer.h
@@ -11,7 +11,7 @@ class MxStreamer : public MxCore
 public:
   virtual ~MxStreamer() override;
 
-  __declspec(dllexport) MxStreamController *Open(const char *name, unsigned short p);
+  __declspec(dllexport) MxStreamController *Open(const char *name, MxU16 p);
   __declspec(dllexport) MxLong Close(const char *p);
 
   virtual MxLong Notify(MxParam &p) override; // vtable+0x4
diff --git a/LEGO1/mxstring.h b/LEGO1/mxstring.h
index a6552bb5..a24a0df1 100644
--- a/LEGO1/mxstring.h
+++ b/LEGO1/mxstring.h
@@ -23,7 +23,7 @@ class MxString : public MxCore
 
 private:
   char *m_data;
-  unsigned short m_length;
+  MxU16 m_length;
 
 };
 
diff --git a/LEGO1/mxvideopresenter.cpp b/LEGO1/mxvideopresenter.cpp
index ee12968a..4e47e4a4 100644
--- a/LEGO1/mxvideopresenter.cpp
+++ b/LEGO1/mxvideopresenter.cpp
@@ -3,6 +3,7 @@
 DECOMP_SIZE_ASSERT(MxVideoPresenter, 0x64);
 
 // OFFSET: LEGO1 0x100b2760 STUB
-void MxVideoPresenter::Init() {
+void MxVideoPresenter::Init()
+{
   // TODO
 }
diff --git a/LEGO1/mxvideopresenter.h b/LEGO1/mxvideopresenter.h
index e9634427..19c211c3 100644
--- a/LEGO1/mxvideopresenter.h
+++ b/LEGO1/mxvideopresenter.h
@@ -8,9 +8,11 @@
 class MxVideoPresenter : public MxMediaPresenter
 {
 public:
-  MxVideoPresenter() {
+  MxVideoPresenter()
+  {
     Init();
   }
+
   // OFFSET: LEGO1 0x1000c820
   inline virtual const char *ClassName() const override // vtable+0x0c
   {
@@ -29,9 +31,9 @@ class MxVideoPresenter : public MxMediaPresenter
   undefined4 m_unk50;
   undefined4 m_unk54;
   undefined4 m_unk58;
-  short m_unk5c;
+  undefined2 m_unk5c;
   unsigned char m_flags;
-  int m_unk60;
+  undefined4 m_unk60;
 };
 
 #endif // MXVIDEOPRESENTER_H