diff --git a/DataSpec/DNAMP1/DNAMP1.cpp b/DataSpec/DNAMP1/DNAMP1.cpp
index 5a2fa090d..d433a56a3 100644
--- a/DataSpec/DNAMP1/DNAMP1.cpp
+++ b/DataSpec/DNAMP1/DNAMP1.cpp
@@ -120,8 +120,8 @@ void PAKBridge::build()
                     auto search = dupeTracker.find(areaDeps.name);
                     if (search != dupeTracker.end() && search->second.first > 1)
                     {
-                        char num[16];
-                        snprintf(num, 16, " (%d)", search->second.second++);
+                        HECL::SystemChar num[16];
+                        HECL::SNPrintf(num, 16, _S(" (%d)"), search->second.second++);
                         areaDeps.name += num;
                     }
 
diff --git a/DataSpec/DNAMP1/MREA.cpp b/DataSpec/DNAMP1/MREA.cpp
index 1deb61f9e..aec2fc888 100644
--- a/DataSpec/DNAMP1/MREA.cpp
+++ b/DataSpec/DNAMP1/MREA.cpp
@@ -1,6 +1,9 @@
 #include "MREA.hpp"
 #include "DeafBabe.hpp"
 
+#define _USE_MATH_DEFINES
+#include <math.h>
+
 namespace Retro
 {
 namespace DNAMP1
diff --git a/DataSpec/DNAMP2/DNAMP2.cpp b/DataSpec/DNAMP2/DNAMP2.cpp
index f11f21774..f79d1b4e4 100644
--- a/DataSpec/DNAMP2/DNAMP2.cpp
+++ b/DataSpec/DNAMP2/DNAMP2.cpp
@@ -117,8 +117,8 @@ void PAKBridge::build()
                     auto search = dupeTracker.find(areaDeps.name);
                     if (search != dupeTracker.end() && search->second.first > 1)
                     {
-                        char num[16];
-                        snprintf(num, 16, " (%d)", search->second.second++);
+                        HECL::SystemChar num[16];
+                        HECL::SNPrintf(num, 16, _S(" (%d)"), search->second.second++);
                         areaDeps.name += num;
                     }
 
diff --git a/DataSpec/DNAMP3/DNAMP3.cpp b/DataSpec/DNAMP3/DNAMP3.cpp
index 241795555..89240b71a 100644
--- a/DataSpec/DNAMP3/DNAMP3.cpp
+++ b/DataSpec/DNAMP3/DNAMP3.cpp
@@ -127,8 +127,8 @@ void PAKBridge::build()
                     auto search = dupeTracker.find(areaDeps.name);
                     if (search != dupeTracker.end() && search->second.first > 1)
                     {
-                        char num[16];
-                        snprintf(num, 16, " (%d)", search->second.second++);
+                        HECL::SystemChar num[16];
+                        HECL::SNPrintf(num, 16, _S(" (%d)"), search->second.second++);
                         areaDeps.name += num;
                     }
 
diff --git a/NODLib b/NODLib
index a7afead6a..dfdfdb274 160000
--- a/NODLib
+++ b/NODLib
@@ -1 +1 @@
-Subproject commit a7afead6ab96592c70ea3d91e6d559a15b825a56
+Subproject commit dfdfdb274917439e7a069d24a045277896cff433
diff --git a/hecl b/hecl
index f4d17c323..25f707926 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit f4d17c323d2801ec76d1126c8fe1931b5e88c12c
+Subproject commit 25f7079269179643f04afa31ff7ac8a4fdef48c6