diff --git a/hecl/CMakeLists.txt b/hecl/CMakeLists.txt
index cf63a0716..d690bdae3 100644
--- a/hecl/CMakeLists.txt
+++ b/hecl/CMakeLists.txt
@@ -3,7 +3,7 @@ project(hecl)
 set(HECL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE PATH "HECL include dir" FORCE)
 add_subdirectory(extern)
 include_directories(include ${LOG_VISOR_INCLUDE_DIR} ${ATHENA_INCLUDE_DIR})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=1")
 add_subdirectory(lib)
 add_subdirectory(blender)
 add_subdirectory(driver)
diff --git a/hecl/driver/CMakeLists.txt b/hecl/driver/CMakeLists.txt
index 6451b5f95..2331b1758 100644
--- a/hecl/driver/CMakeLists.txt
+++ b/hecl/driver/CMakeLists.txt
@@ -21,5 +21,5 @@ list(APPEND DATA_SPEC_LIBS
 target_link_libraries(hecl
     HECLDatabase
     "-Wl,-whole-archive" ${DATA_SPEC_LIBS} "-Wl,-no-whole-archive"
-    HECL  AthenaCore NOD LogVisor blowfish z lzo2 pthread
+    HECL AthenaCore NOD LogVisor blowfish z lzo2 pthread
 )
diff --git a/hecl/driver/ToolBase.hpp b/hecl/driver/ToolBase.hpp
index 4aeb07183..a3006f151 100644
--- a/hecl/driver/ToolBase.hpp
+++ b/hecl/driver/ToolBase.hpp
@@ -77,10 +77,7 @@ private:
                     ++it;
                 }
                 if (counter == WRAP_INDENT)
-                {
-                    string.insert(it, WRAP_INDENT, _S(' '));
-                    it += WRAP_INDENT;
-                }
+                    it = string.insert(it, WRAP_INDENT, _S(' ')) + WRAP_INDENT;
                 if (it >= string.end())
                     return;
                 if (*it != _S('\n'))
diff --git a/hecl/extern/Athena b/hecl/extern/Athena
index 55adeec69..7ef451c86 160000
--- a/hecl/extern/Athena
+++ b/hecl/extern/Athena
@@ -1 +1 @@
-Subproject commit 55adeec69c97467c010b110d27373e02803f806f
+Subproject commit 7ef451c86a99df7239aaecf23c11a39ec0b93ff3
diff --git a/hecl/extern/LogVisor b/hecl/extern/LogVisor
index c1f226b4d..36c62436d 160000
--- a/hecl/extern/LogVisor
+++ b/hecl/extern/LogVisor
@@ -1 +1 @@
-Subproject commit c1f226b4dca45bb822b6a96c8571250a9e991e21
+Subproject commit 36c62436d24fb0d92ae470bfaf6a0de763626869
diff --git a/hecl/extern/RetroCommon b/hecl/extern/RetroCommon
index 975429f3c..6aa69f277 160000
--- a/hecl/extern/RetroCommon
+++ b/hecl/extern/RetroCommon
@@ -1 +1 @@
-Subproject commit 975429f3c690dacfc8d112b033e512b52730fb54
+Subproject commit 6aa69f27752355c77f7a5dfb2205d08b59815881