diff --git a/DataSpec/DNAMP1/FRME.cpp b/DataSpec/DNAMP1/FRME.cpp
index a1f323efe..42fb4be10 100644
--- a/DataSpec/DNAMP1/FRME.cpp
+++ b/DataSpec/DNAMP1/FRME.cpp
@@ -342,7 +342,7 @@ bool FRME::Extract(const SpecBase &dataSpec, PAKEntryReadStream &rs, const HECL:
             using MODLInfo = FRME::Widget::MODLInfo;
             MODLInfo* info = dynamic_cast<MODLInfo*>(w.widgetInfo.get());
             HECL::ProjectPath modelPath = pakRouter.getWorking(info->model);
-            const typename PAKRouter<PAKBridge>::EntryType* cmdlE = pakRouter.lookupEntry(info->model, nullptr, true, true);
+            const PAKRouter<PAKBridge>::EntryType* cmdlE = pakRouter.lookupEntry(info->model, nullptr, true, true);
 
             os.linkBlend(modelPath.getAbsolutePathUTF8().c_str(),
                          pakRouter.getBestEntryName(*cmdlE).c_str(), false);
@@ -361,7 +361,7 @@ bool FRME::Extract(const SpecBase &dataSpec, PAKEntryReadStream &rs, const HECL:
             {
                 std::string texName = pakRouter.getBestEntryName(info->texture);
                 const NOD::Node* node;
-                const typename PAKRouter<PAKBridge>::EntryType* texEntry = pakRouter.lookupEntry(info->texture, &node);
+                const PAKRouter<PAKBridge>::EntryType* texEntry = pakRouter.lookupEntry(info->texture, &node);
                 HECL::ProjectPath txtrPath = pakRouter.getWorking(texEntry);
                 if (txtrPath.getPathType() == HECL::ProjectPath::Type::None)
                 {
diff --git a/NODLib b/NODLib
index 9ce2e0a3b..df5e8d068 160000
--- a/NODLib
+++ b/NODLib
@@ -1 +1 @@
-Subproject commit 9ce2e0a3b29df5fc3e4b299c02209d6e29eea352
+Subproject commit df5e8d068c07b798ca514892730d043d14f7ee07
diff --git a/hecl b/hecl
index 80dd16dbe..40209030e 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 80dd16dbe1d7e61f71079b1008636e997453e6fa
+Subproject commit 40209030e0d0c23b6bb553ea8d5e5e33a6f1552b