diff --git a/.github/scripts/zlib/linux.sh b/.github/scripts/zlib/linux.sh
index 2fb289e..7ec9339 100644
--- a/.github/scripts/zlib/linux.sh
+++ b/.github/scripts/zlib/linux.sh
@@ -16,6 +16,3 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=23 -DZLIB_BUILD_EXAMPLES=O
 cmake --build .
 cmake --install .
 cd ..
-
-# Back to root directory
-cd ..
diff --git a/.github/scripts/zlib/macos.sh b/.github/scripts/zlib/macos.sh
index 2fb289e..7ec9339 100644
--- a/.github/scripts/zlib/macos.sh
+++ b/.github/scripts/zlib/macos.sh
@@ -16,6 +16,3 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=23 -DZLIB_BUILD_EXAMPLES=O
 cmake --build .
 cmake --install .
 cd ..
-
-# Back to root directory
-cd ..
diff --git a/.github/scripts/zlib/windows.bat b/.github/scripts/zlib/windows.bat
index b397275..9540387 100644
--- a/.github/scripts/zlib/windows.bat
+++ b/.github/scripts/zlib/windows.bat
@@ -15,6 +15,3 @@ cmake -A x64 -DCMAKE_CXX_STANDARD=23 -DZLIB_BUILD_EXAMPLES=OFF -DCMAKE_INSTALL_P
 cmake --build . --config Release
 cmake --install . --config Release
 CD ..
-
-:: Back to root directory
-CD ..
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 07b301f..c219173 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -63,7 +63,7 @@ jobs:
         name: LibCmo-linux-build
         path: bin/install/*
         retention-days: 30
-    - name: Upload Built ependencies
+    - name: Upload Built Dependencies
       uses: actions/upload-artifact@v4
       with:
         name: LibCmo-linux-dep
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index ca54d93..e8d787b 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -58,9 +58,9 @@ jobs:
         name: LibCmo-macos-build
         path: bin/install/*
         retention-days: 30
-    - name: Upload Built ependencies
+    - name: Upload Built Dependencies
       uses: actions/upload-artifact@v4
       with:
-        name: LibCmo-linux-dep
+        name: LibCmo-macos-dep
         path: extern/zlib/install/*
         retention-days: 30   
\ No newline at end of file
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 1a9277f..6b10793 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -38,8 +38,8 @@ jobs:
     - name: Build ZLIB
       shell: cmd
       run: |
-        CD extern/zlib
-        ..\..\.github\scripts\zlib\windows.bat
+        CD extern\zlib
+        CALL ..\..\.github\scripts\zlib\windows.bat
         ECHO SET ZLIB_ROOT=%ZLIB_ROOT% >> ..\envs.bat
         CD ..\..
     - name: Fetch STB
@@ -51,8 +51,8 @@ jobs:
     - name: Build STB
       shell: cmd
       run: |
-        CD extern/stb
-        ..\..\.github\scripts\stb\windows.bat
+        CD extern\stb
+        CALL ..\..\.github\scripts\stb\windows.bat
         ECHO SET STB_ROOT=%STB_ROOT% >> ..\envs.bat
         CD ..\..
     - name: Build LibCmo
diff --git a/Ballance/BMap/BMap/BMExports.cpp b/Ballance/BMap/BMap/BMExports.cpp
index a0de59d..1c269a5 100644
--- a/Ballance/BMap/BMap/BMExports.cpp
+++ b/Ballance/BMap/BMap/BMExports.cpp
@@ -1,5 +1,6 @@
 #include "BMExports.hpp"
 #include <yycc.hpp>
+#include <yycc/carton/ironpad.hpp>
 #include <set>
 #include <type_traits>
 #include <memory>
@@ -59,8 +60,8 @@ bool BMInit() {
 	if (CheckInited()) return false;
 
 	// register exception handler if we are in Windows.
-#if defined(LIBCMO_BUILD_RELEASE) && (YYCC_OS == YYCC_OS_WINDOWS)
-	YYCC::ExceptionHelper::Register();
+#if defined(LIBCMO_BUILD_RELEASE) && defined(YYCC_OS_WINDOWS)
+	yycc::carton::ironpad::startup();
 #endif
 
 	// and startup CK environment
@@ -93,8 +94,8 @@ bool BMDispose() {
 	LibCmo::CK2::CKShutdown();
 
 	// unregister exception handler if we are in Windows
-#if defined(LIBCMO_BUILD_RELEASE) && (YYCC_OS == YYCC_OS_WINDOWS)
-	YYCC::ExceptionHelper::Unregister();
+#if defined(LIBCMO_BUILD_RELEASE) && defined(YYCC_OS_WINDOWS)
+	yycc::carton::ironpad::shutdown();
 #endif
 
 	return true;
diff --git a/LibCmo/LibCmo/CK2/CKGlobals.cpp b/LibCmo/LibCmo/CK2/CKGlobals.cpp
index cb822ae..b384e58 100644
--- a/LibCmo/LibCmo/CK2/CKGlobals.cpp
+++ b/LibCmo/LibCmo/CK2/CKGlobals.cpp
@@ -11,6 +11,9 @@
 #include <yycc/string/reinterpret.hpp>
 #include <algorithm>
 #include <initializer_list>
+#include <limits>
+#include <cctype>
+#include <cstring>
 
 // Import implementations.
 #include "ObjImpls/CKObject.hpp"
diff --git a/Unvirt/Unvirt.cpp b/Unvirt/Unvirt.cpp
index dcb0eaa..dc6cc42 100644
--- a/Unvirt/Unvirt.cpp
+++ b/Unvirt/Unvirt.cpp
@@ -1,10 +1,22 @@
 #include "UnvirtContext.hpp"
+#include <yycc.hpp>
+#include <yycc/carton/ironpad.hpp>
 
 int main(int argc, char* argv[]) {
 	
+	// register exception handler if we are in Windows.
+#if defined(LIBCMO_BUILD_RELEASE) && defined(YYCC_OS_WINDOWS)
+	yycc::carton::ironpad::startup();
+#endif
+
 	// run core
 	Unvirt::Context::UnvirtContext ctx;
 	ctx.Run();
 
+	// unregister exception handler if we are in Windows
+#if defined(LIBCMO_BUILD_RELEASE) && defined(YYCC_OS_WINDOWS)
+	yycc::carton::ironpad::shutdown();
+#endif
+
 	return 0;
 }
diff --git a/Unvirt/Utils.cpp b/Unvirt/Utils.cpp
index bb2b0ce..a49008b 100644
--- a/Unvirt/Utils.cpp
+++ b/Unvirt/Utils.cpp
@@ -1,6 +1,7 @@
 #include "Utils.hpp"
 #include <yycc/num/op.hpp>
 #include <stdexcept>
+#include <algorithm>
 
 namespace Unvirt::Utils {
 
diff --git a/Unvirt/Utils.hpp b/Unvirt/Utils.hpp
index 20dd88c..d2dbc75 100644
--- a/Unvirt/Utils.hpp
+++ b/Unvirt/Utils.hpp
@@ -1,5 +1,7 @@
 #pragma once
+#include <yycc.hpp>
 #include <yycc/macro/class_copy_move.hpp>
+#include <cstddef>
 
 namespace Unvirt::Utils {