diff --git a/Source/Client/Mode/CGameMode.h b/Source/Client/Mode/CGameMode.h
index fe12a825..bc6d03ea 100644
--- a/Source/Client/Mode/CGameMode.h
+++ b/Source/Client/Mode/CGameMode.h
@@ -167,7 +167,7 @@ public:
   /* 0404 */ int unknown_0404;
   /* 0408 */ void* unknown_0408;
   /* 040C */ int unknown_040C;
-  /* 0410 */ unsigned char unknown_0410[0x04];
+  /* 0410 */ int unknown_0410;
   /* 0414 */ int unknown_0414;
   /* 0418 */ unsigned char unknown_0418;
   /* 041C */ int miniMapTooltipId;
@@ -192,7 +192,8 @@ public:
   /* 05CE */ unsigned char unknown_05CE;
   /* 05CF */ unsigned char unknown_05CF;
   /* 05D0 */ UIWindow* unknown_05D0;
-  /* 05D4 */ unsigned char unknown_05D4[0x10];
+  /* 05D4 */ std::list<unsigned long> unknown_05D4;
+  /* 05DC */ std::map<int, std::string> miniMapTooltipWindows;
   /* 05E4 */ std::uint32_t wheelTick;
   /* 05E8 */ std::uint32_t replayPauseTick;
   /* 05EC */ unsigned char unknown_05EC[0x08];
diff --git a/Source/Client/Mode/GameModeMiniMap.cpp b/Source/Client/Mode/GameModeMiniMap.cpp
index e42eb7a0..7867aa61 100644
--- a/Source/Client/Mode/GameModeMiniMap.cpp
+++ b/Source/Client/Mode/GameModeMiniMap.cpp
@@ -809,7 +809,7 @@ char g_miniMapTooltipText[256];
 void CGameMode::RefreshMiniMapTooltips() {
   int& tooltipId = this->miniMapTooltipId;
   std::string& tooltipText = this->miniMapTooltipText;
-  std::map<int, std::string>& tooltipWindows = *reinterpret_cast<std::map<int, std::string>*>(&this->unknown_05D4[0x08]);
+  std::map<int, std::string>& tooltipWindows = this->miniMapTooltipWindows;
 
   if (tooltipId == -1) {
     if (tooltipWindows.size() == 0) {
diff --git a/Source/Client/Mode/GameModePackets.cpp b/Source/Client/Mode/GameModePackets.cpp
index b73ee047..eae89027 100644
--- a/Source/Client/Mode/GameModePackets.cpp
+++ b/Source/Client/Mode/GameModePackets.cpp
@@ -2196,7 +2196,7 @@ void CGameMode::ReceiveActorMessage7(const unsigned char* packet) {
 // FUNCTION: fn_22194
 void CGameMode::Zc_Start_Baby(const unsigned char*) {
   this->unknown_040C = 20001;
-  *reinterpret_cast<int*>(this->unknown_0410) = 5;
+  this->unknown_0410 = 5;
   this->unknown_0414 = 0;
   this->unknown_0408 = reinterpret_cast<void*>(2);
 }
@@ -2205,7 +2205,7 @@ void CGameMode::Zc_Start_Baby(const unsigned char*) {
 // FUNCTION: fn_22195
 void CGameMode::Zc_Start_Capture(const unsigned char*) {
   this->unknown_040C = 10000;
-  *reinterpret_cast<int*>(this->unknown_0410) = 5;
+  this->unknown_0410 = 5;
   this->unknown_0414 = 0;
   this->unknown_0408 = reinterpret_cast<void*>(2);
 }
@@ -2214,7 +2214,7 @@ void CGameMode::Zc_Start_Capture(const unsigned char*) {
 // FUNCTION: fn_22196
 void CGameMode::Zc_Start_Collection(const unsigned char*) {
   this->unknown_040C = 40000;
-  *reinterpret_cast<int*>(this->unknown_0410) = 1;
+  this->unknown_0410 = 1;
   this->unknown_0414 = 0;
   this->unknown_0408 = reinterpret_cast<void*>(2);
 }
@@ -2223,7 +2223,7 @@ void CGameMode::Zc_Start_Collection(const unsigned char*) {
 // FUNCTION: fn_22197
 void CGameMode::Zc_Start_Couple(const unsigned char*) {
   this->unknown_040C = 20000;
-  *reinterpret_cast<int*>(this->unknown_0410) = 5;
+  this->unknown_0410 = 5;
   this->unknown_0414 = 0;
   this->unknown_0408 = reinterpret_cast<void*>(2);
 }
diff --git a/Source/Contents/Configuration/ServiceOptions.cpp b/Source/Contents/Configuration/ServiceOptions.cpp
index 123679a2..4904efbc 100644
--- a/Source/Contents/Configuration/ServiceOptions.cpp
+++ b/Source/Contents/Configuration/ServiceOptions.cpp
@@ -992,7 +992,7 @@ void ToggleSitStand() {
   mode->SendMsg(0x8B, (static_cast<int>(player->render.angle) + 180) / 45 % 8, motion, 0, 0);
 
   if (player->render.unknown_0070 == 6) {
-    std::list<unsigned long>& times = *reinterpret_cast<std::list<unsigned long>*>(mode->unknown_05D4);
+    std::list<unsigned long>& times = mode->unknown_05D4;
     times.pop_front();
     times.push_back(timeGetTime());
     const unsigned long elapsed = times.back() - times.front();