diff --git a/Runtime/CGameState.cpp b/Runtime/CGameState.cpp
index 933a6e5f4..dfce6809d 100644
--- a/Runtime/CGameState.cpp
+++ b/Runtime/CGameState.cpp
@@ -74,7 +74,7 @@ CWorldState::CWorldState(CAssetId id) : x0_mlvlId(id), x4_areaId(0) {
 }
 
 CWorldState::CWorldState(CBitStreamReader& reader, CAssetId mlvlId, const CSaveWorld& saveWorld) : x0_mlvlId(mlvlId) {
-  x4_areaId = reader.ReadEncoded(32);
+  x4_areaId = TAreaId(reader.ReadEncoded(32));
   x10_desiredAreaAssetId = u32(reader.ReadEncoded(32));
   x8_relayTracker = std::make_shared<CRelayTracker>(reader, saveWorld);
   xc_mapWorldInfo = std::make_shared<CMapWorldInfo>(reader, saveWorld, mlvlId);
diff --git a/Runtime/CStateManager.cpp b/Runtime/CStateManager.cpp
index a8cdc8629..eac8d45c6 100644
--- a/Runtime/CStateManager.cpp
+++ b/Runtime/CStateManager.cpp
@@ -1188,7 +1188,7 @@ void CStateManager::SendScriptMsgAlways(TUniqueId dest, TUniqueId src, EScriptOb
 }
 
 void CStateManager::SendScriptMsg(TUniqueId src, TEditorId dest, EScriptObjectMessage msg, EScriptObjectState state) {
-  CEntity* ent = ObjectById(src);
+  //CEntity* ent = GetObjectById(src);
   auto search = GetIdListForScript(dest);
   if (search.first != x890_scriptIdMap.cend()) {
     for (auto it = search.first; it != search.second; ++it) {
@@ -1462,8 +1462,7 @@ void CStateManager::ApplyDamageToWorld(TUniqueId damager, const CActor& actor, c
     if (bomb && player) {
       if (player->GetFrozenState()) {
         g_GameState->SystemOptions().IncrementFrozenBallCount();
-        CHUDMemoParms info = {0.f, true, true, true};
-        MP1::CSamusHud::DisplayHudMemo(u"", info);
+        MP1::CSamusHud::DisplayHudMemo(u"", CHUDMemoParms{0.f, true, true, true});
         player->UnFreeze(*this);
       } else {
         if ((weapon->GetAttribField() & EProjectileAttrib::Bombs) == EProjectileAttrib::Bombs)
diff --git a/amuse b/amuse
index 529efa72b..ea84a7e35 160000
--- a/amuse
+++ b/amuse
@@ -1 +1 @@
-Subproject commit 529efa72b4136abb77c0e35c587a2ff80a76989a
+Subproject commit ea84a7e35bfca9a14c5f403274e43045f31bc4f1
diff --git a/hecl b/hecl
index 15c13163e..e7fa2f259 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 15c13163e8825d343eecd6a334c2042fbbca4814
+Subproject commit e7fa2f25920188ada7ad67c9ec794fe114a1edfb
diff --git a/hecl-gui b/hecl-gui
index 0ed3cda78..6963baacb 160000
--- a/hecl-gui
+++ b/hecl-gui
@@ -1 +1 @@
-Subproject commit 0ed3cda78bbf70d79b45167dac8a02860132f650
+Subproject commit 6963baacbc54f52e9e95564b90adf6eb550983c5