diff --git a/.gitmodules b/.gitmodules
index 6d2172e..e09a672 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,8 @@
 [submodule "extern/lzokay"]
 	path = extern/lzokay
 	url = https://github.com/jackoalan/lzokay.git
+	branch = master
 [submodule "extern/fmt"]
 	path = extern/fmt
 	url = https://github.com/fmtlib/fmt
+	branch = master
diff --git a/extern/fmt b/extern/fmt
index 9bdd159..95da484 160000
--- a/extern/fmt
+++ b/extern/fmt
@@ -1 +1 @@
-Subproject commit 9bdd1596cef1b57b9556f8bef32dc4a32322ef3e
+Subproject commit 95da4847274c42c110fd5bf1bf61d3f94be4a08e
diff --git a/extern/lzokay b/extern/lzokay
index 671e2b9..546a969 160000
--- a/extern/lzokay
+++ b/extern/lzokay
@@ -1 +1 @@
-Subproject commit 671e2b98642f95aaf29251367791f28e5597a0a7
+Subproject commit 546a9695271e8a8b4711383f828172754fd825f2
diff --git a/include/athena/Global.hpp b/include/athena/Global.hpp
index e7f34cf..57eceaa 100644
--- a/include/athena/Global.hpp
+++ b/include/athena/Global.hpp
@@ -156,7 +156,7 @@ template <typename First, typename... Rest>
 constexpr auto __FIRST_ARG__(First first, Rest...) { return first; }
 template <typename S, typename... Args>
 auto __make_args_checked__(const S& format_str, Args&&... args) {
-  return fmt::internal::make_args_checked<Args...>(format_str, std::forward<Args>(args)...);
+  return fmt::make_args_checked<Args...>(format_str, std::forward<Args>(args)...);
 }
 
 #ifndef NDEBUG
diff --git a/src/athena/Global.cpp b/src/athena/Global.cpp
index 2624c5c..60937c9 100644
--- a/src/athena/Global.cpp
+++ b/src/athena/Global.cpp
@@ -57,7 +57,7 @@ static void __defaultExceptionHandler(athena::error::Level level, const char* fi
     break;
   }
 
-  std::string msg = fmt::internal::vformat(fmt, args);
+  std::string msg = fmt::vformat(fmt, args);
   std::cerr << levelStr << " " << file << " " << function << "(" << line << "): " << msg << std::endl;
 }