diff --git a/hecl/.gitmodules b/hecl/.gitmodules
index e14a4ddd6..327e223b2 100644
--- a/hecl/.gitmodules
+++ b/hecl/.gitmodules
@@ -1,12 +1,15 @@
 [submodule "extern/libSquish"]
 	path = extern/libSquish
 	url = ../libSquish.git
+	branch = master
 [submodule "extern/athena"]
 	path = extern/athena
 	url = ../../libAthena/athena.git
+	branch = master
 [submodule "extern/boo"]
 	path = extern/boo
 	url = ../boo.git
+	branch = master
 [submodule "extern/libjpeg-turbo"]
 	path = extern/libjpeg-turbo
 	url = ../libjpeg-turbo.git
diff --git a/hecl/extern/athena b/hecl/extern/athena
index c776c4a31..fc3e9a51d 160000
--- a/hecl/extern/athena
+++ b/hecl/extern/athena
@@ -1 +1 @@
-Subproject commit c776c4a31dc88ff4c3214ed90332c699a2e35362
+Subproject commit fc3e9a51d2c8cf449c05b9eeb1da251ea389ea53
diff --git a/hecl/extern/boo b/hecl/extern/boo
index 771dbaf1a..bb6274e63 160000
--- a/hecl/extern/boo
+++ b/hecl/extern/boo
@@ -1 +1 @@
-Subproject commit 771dbaf1aa6e7745134907cebce6f989b6b8318a
+Subproject commit bb6274e63815dc9b2b630a08abc2240b1990bf59
diff --git a/hecl/include/hecl/Console.hpp b/hecl/include/hecl/Console.hpp
index 9f3e4bbee..e5c81a11a 100644
--- a/hecl/include/hecl/Console.hpp
+++ b/hecl/include/hecl/Console.hpp
@@ -96,7 +96,7 @@ public:
   void report(Level level, const S& format, Args&&... args) {
     vreport(level, fmt::to_string_view<Char>(format),
             fmt::basic_format_args<fmt::buffer_context<Char>>(
-                fmt::internal::make_args_checked<Args...>(format, args...)));
+                fmt::make_args_checked<Args...>(format, args...)));
   }
 
   void init(boo::IWindow* ctx);
diff --git a/hecl/lib/Console.cpp b/hecl/lib/Console.cpp
index 61992b560..73967bff5 100644
--- a/hecl/lib/Console.cpp
+++ b/hecl/lib/Console.cpp
@@ -385,7 +385,7 @@ void Console::handleSpecialKeyUp(boo::ESpecialKey /*sp*/, boo::EModifierKey /*mo
 
 void Console::LogVisorAdapter::report(const char* modName, logvisor::Level severity,
                                       fmt::string_view format, fmt::format_args args) {
-  auto tmp = fmt::internal::vformat(format, args);
+  auto tmp = fmt::vformat(format, args);
   std::vector<std::string> lines = athena::utility::split(tmp, '\n');
   for (const std::string& line : lines) {
     auto v = fmt::format(FMT_STRING("[{}] {}"), modName, line);
@@ -395,7 +395,7 @@ void Console::LogVisorAdapter::report(const char* modName, logvisor::Level sever
 
 void Console::LogVisorAdapter::report(const char* modName, logvisor::Level severity,
                                       fmt::wstring_view format, fmt::wformat_args args) {
-  auto tmp = fmt::internal::vformat(format, args);
+  auto tmp = fmt::vformat(format, args);
   std::vector<std::string> lines = athena::utility::split(athena::utility::wideToUtf8(tmp), '\n');
   for (const std::string& line : lines) {
     auto v = fmt::format(FMT_STRING("[{}] {}"), modName, line);
@@ -405,14 +405,14 @@ void Console::LogVisorAdapter::report(const char* modName, logvisor::Level sever
 
 void Console::LogVisorAdapter::reportSource(const char* modName, logvisor::Level severity, const char* file,
                                             unsigned linenum, fmt::string_view format, fmt::format_args args) {
-  auto tmp = fmt::internal::vformat(format, args);
+  auto tmp = fmt::vformat(format, args);
   auto v = fmt::format(FMT_STRING("[{}] {} {}:{}"), modName, tmp, file, linenum);
   m_con->m_log.emplace_back(std::move(v), Console::Level(severity));
 }
 
 void Console::LogVisorAdapter::reportSource(const char* modName, logvisor::Level severity, const char* file,
                                             unsigned linenum, fmt::wstring_view format, fmt::wformat_args args) {
-  auto tmp = fmt::internal::vformat(format, args);
+  auto tmp = fmt::vformat(format, args);
   std::vector<std::string> lines = athena::utility::split(athena::utility::wideToUtf8(tmp), '\n');
   for (const std::string& line : lines) {
     auto v = fmt::format(FMT_STRING("[{}] {} {}:{}"), modName, line, file, linenum);