diff --git a/LEGO1/lego/legoomni/include/act1state.h b/LEGO1/lego/legoomni/include/act1state.h
index 5a39c9b3..fed9b9e7 100644
--- a/LEGO1/lego/legoomni/include/act1state.h
+++ b/LEGO1/lego/legoomni/include/act1state.h
@@ -11,6 +11,12 @@ class LegoTexture;
 // SIZE 0x26c
 class Act1State : public LegoState {
 public:
+	enum {
+		e_unk953 = 953,
+		e_unk954 = 954,
+		e_unk955 = 955,
+	};
+
 	Act1State();
 
 	// FUNCTION: LEGO1 0x100338a0
@@ -50,7 +56,7 @@ class Act1State : public LegoState {
 
 		inline void SetName(const char* p_name) { m_name = p_name; }
 		inline const MxString* GetName() const { return &m_name; }
-		int Serialize(LegoFile* p_file);
+		MxS32 Serialize(LegoFile* p_file);
 
 	private:
 		MxString m_name;         // 0x00
@@ -73,7 +79,7 @@ class Act1State : public LegoState {
 	};
 
 protected:
-	int* m_unk0x008; // 0x008
+	MxS32* m_unk0x008; // 0x008
 	// FIXME: count for m_unk0x008
 	MxS16 m_unk0x00c;         // 0x00c
 	undefined2 m_unk0x00e;    // 0x00e
diff --git a/LEGO1/lego/legoomni/src/act1/act1state.cpp b/LEGO1/lego/legoomni/src/act1/act1state.cpp
index 6748de5d..1ed10df9 100644
--- a/LEGO1/lego/legoomni/src/act1/act1state.cpp
+++ b/LEGO1/lego/legoomni/src/act1/act1state.cpp
@@ -9,17 +9,11 @@ Act1State::NamedTexture* ReadNamedTexture(LegoFile* p_file);
 void WriteNamedTexture(LegoFile* p_file, Act1State::NamedTexture* p_texture);
 void FUN_1003f540(LegoFile* p_file, const char* p_filename);
 
-enum {
-	e_unk953 = 953,
-	e_unk954 = 954,
-	e_unk955 = 955,
-};
-
 // GLOBAL: ISLE 0x100f37f0
-int g_unk0x100f37f0[] = {
-	e_unk953,
-	e_unk954,
-	e_unk955,
+MxS32 g_unk0x100f37f0[] = {
+	Act1State::e_unk953,
+	Act1State::e_unk954,
+	Act1State::e_unk955,
 };
 
 // STUB: LEGO1 0x100334b0
@@ -185,7 +179,7 @@ MxResult Act1State::VTable0x1c(LegoFile* p_legoFile)
 }
 
 // FUNCTION: LEGO1 0x100344d0
-int Act1State::NamedPlane::Serialize(LegoFile* p_file)
+MxS32 Act1State::NamedPlane::Serialize(LegoFile* p_file)
 {
 	if (p_file->IsWriteMode()) {
 		p_file->FUN_10006030(m_name);