diff --git a/LEGO1/lego/legoomni/include/legostate.h b/LEGO1/lego/legoomni/include/legostate.h
index 54154634..03afb148 100644
--- a/LEGO1/lego/legoomni/include/legostate.h
+++ b/LEGO1/lego/legoomni/include/legostate.h
@@ -49,7 +49,7 @@ class LegoState : public MxCore {
 		void* m_unk0x00;      // 0x00
 		undefined2 m_unk0x04; // 0x04
 		undefined2 m_unk0x06; // 0x06
-		MxS16 m_unk0x08;      // 0x08
+		MxU16 m_unk0x08;      // 0x08
 
 		StateStruct();
 	};
diff --git a/LEGO1/lego/legoomni/include/radiostate.h b/LEGO1/lego/legoomni/include/radiostate.h
index 8784c00a..fa992da5 100644
--- a/LEGO1/lego/legoomni/include/radiostate.h
+++ b/LEGO1/lego/legoomni/include/radiostate.h
@@ -29,7 +29,7 @@ class RadioState : public LegoState {
 
 private:
 	StateStruct m_unk0x08[3]; // 0x08
-	MxU16 m_unk0x2c;          // 0x2c
+	MxS16 m_unk0x2c;          // 0x2c
 	undefined m_unk0x2e;      // 0x2e
 };
 
diff --git a/LEGO1/lego/legoomni/src/isle/radiostate.cpp b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
index d579471b..18089270 100644
--- a/LEGO1/lego/legoomni/src/isle/radiostate.cpp
+++ b/LEGO1/lego/legoomni/src/isle/radiostate.cpp
@@ -50,8 +50,8 @@ RadioState::RadioState()
 {
 	srand(Timer()->GetTime());
 
-	MxU32 random = rand();
-	m_unk0x2c = (MxS32) random % 3;
+	MxS32 random = rand();
+	m_unk0x2c = random % 3;
 
 	m_unk0x08[0].m_unk0x00 = m_unk0x100f3218;
 	m_unk0x08[0].m_unk0x04 = 6;
@@ -64,7 +64,7 @@ RadioState::RadioState()
 	m_unk0x08[1].m_unk0x04 = 14;
 	m_unk0x08[1].m_unk0x06 = 0;
 	m_unk0x08[1].m_unk0x08 = 0;
-	m_unk0x08[0].m_unk0x08 = random % 6;
+	m_unk0x08[0].m_unk0x08 = (MxU32) random % 6;
 
 	random = rand();
 
@@ -72,11 +72,11 @@ RadioState::RadioState()
 	m_unk0x08[2].m_unk0x04 = 9;
 	m_unk0x08[2].m_unk0x06 = 0;
 	m_unk0x08[2].m_unk0x08 = 0;
-	m_unk0x08[1].m_unk0x08 = random % 14;
+	m_unk0x08[1].m_unk0x08 = (MxU32) random % 14;
 
 	random = rand();
 
-	m_unk0x08[2].m_unk0x08 = random % 9;
+	m_unk0x08[2].m_unk0x08 = (MxU32) random % 9;
 
 	m_unk0x2e = 0;
 }