diff --git a/hecl/driver/CMakeLists.txt b/hecl/driver/CMakeLists.txt
index 2a71927e8..19965bbbe 100644
--- a/hecl/driver/CMakeLists.txt
+++ b/hecl/driver/CMakeLists.txt
@@ -32,5 +32,5 @@ endif()
 target_link_libraries(hecl
     ${WHOLE_START} HECLDatabaseInit ${DATA_SPEC_LIBS} ${WHOLE_END}
     HECLDatabase HECLBlender HECLCommon AthenaCore AngelScript NOD
-    LogVisor png squish blowfish z lzo2
+    LogVisor yaml png squish blowfish z lzo2
 )
diff --git a/hecl/extern/Athena b/hecl/extern/Athena
index 83cc8fe3c..12e759663 160000
--- a/hecl/extern/Athena
+++ b/hecl/extern/Athena
@@ -1 +1 @@
-Subproject commit 83cc8fe3c35c23cfdb207a2267cf73a0e7d014da
+Subproject commit 12e7596639a89abfb3557393d746471a9d5aabba
diff --git a/hecl/extern/RetroCommon b/hecl/extern/RetroCommon
index 28985165f..df2adc10d 160000
--- a/hecl/extern/RetroCommon
+++ b/hecl/extern/RetroCommon
@@ -1 +1 @@
-Subproject commit 28985165ffa189dc6d7b352b650bc94ddc999887
+Subproject commit df2adc10da511f0be94214eae58d2f8075fb3842