diff --git a/Runtime/MP1/MP1.cpp b/Runtime/MP1/MP1.cpp
index 7d78ded42..06c30ebb8 100644
--- a/Runtime/MP1/MP1.cpp
+++ b/Runtime/MP1/MP1.cpp
@@ -357,6 +357,7 @@ void CMain::InitializeSubsystems() {
   CAnimData::InitializeCache();
   CDecalManager::Initialize();
   CGBASupport::Initialize();
+  CGraphics::g_BooFactory->waitUntilShadersReady();
 }
 
 void CMain::MemoryCardInitializePump() {
diff --git a/Runtime/Weapon/CFlameThrower.hpp b/Runtime/Weapon/CFlameThrower.hpp
index ad5fe1f7e..d23030671 100644
--- a/Runtime/Weapon/CFlameThrower.hpp
+++ b/Runtime/Weapon/CFlameThrower.hpp
@@ -2,7 +2,6 @@
 
 #include "Weapon/CGameProjectile.hpp"
 #include "Particle/CFlameWarp.hpp"
-#include "Graphics/Shaders/CAABoxShader.hpp"
 
 namespace urde {
 class CFlameInfo;
diff --git a/Runtime/World/CPathFindRegion.cpp b/Runtime/World/CPathFindRegion.cpp
index 12d1f4ecd..cfb86be85 100644
--- a/Runtime/World/CPathFindRegion.cpp
+++ b/Runtime/World/CPathFindRegion.cpp
@@ -150,7 +150,7 @@ bool CPFRegion::FindBestPoint(std::vector<zeus::CVector3f>& polyPoints, const ze
 
   if (!isFlyer) {
     polyPoints.clear();
-    for (u32 i = x0_numNodes - 1; i >= 0; --i) {
+    for (int i = int(x0_numNodes) - 1; i >= 0; --i) {
       CPFNode& node = x4_startNode[i];
       polyPoints.push_back(node.GetPos());
       polyPoints.back().z() += x14_height;
diff --git a/hecl b/hecl
index 6caf187e3..8085bc967 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 6caf187e3204ff5e92b40b6f50b015ef785c69d7
+Subproject commit 8085bc96753ef27a84210a7c4226a8ff76d98437
diff --git a/specter b/specter
index d4a4c4253..fac824cb7 160000
--- a/specter
+++ b/specter
@@ -1 +1 @@
-Subproject commit d4a4c425371077cf7ebb2088086755b7d28c7342
+Subproject commit fac824cb79d6fd5c4c4ee2bf53c10194064a4d1b