diff --git a/hecl/CMakeLists.txt b/hecl/CMakeLists.txt
index d690bdae3..cf63a0716 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 -D_GLIBCXX_USE_CXX11_ABI=1")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 add_subdirectory(lib)
 add_subdirectory(blender)
 add_subdirectory(driver)
diff --git a/hecl/driver/ToolBase.hpp b/hecl/driver/ToolBase.hpp
index a3006f151..8eec2466f 100644
--- a/hecl/driver/ToolBase.hpp
+++ b/hecl/driver/ToolBase.hpp
@@ -77,7 +77,10 @@ private:
                     ++it;
                 }
                 if (counter == WRAP_INDENT)
-                    it = string.insert(it, WRAP_INDENT, _S(' ')) + WRAP_INDENT;
+                {
+                    for (int i=0 ; i<WRAP_INDENT ; ++i)
+                        it = string.insert(it, _S(' ')) + 1;
+                }
                 if (it >= string.end())
                     return;
                 if (*it != _S('\n'))
diff --git a/hecl/extern/Athena b/hecl/extern/Athena
index 7ef451c86..11331e068 160000
--- a/hecl/extern/Athena
+++ b/hecl/extern/Athena
@@ -1 +1 @@
-Subproject commit 7ef451c86a99df7239aaecf23c11a39ec0b93ff3
+Subproject commit 11331e068ecee56e8c46003fa7439c2b7450fd0f
diff --git a/hecl/extern/LogVisor b/hecl/extern/LogVisor
index 36c62436d..462971b13 160000
--- a/hecl/extern/LogVisor
+++ b/hecl/extern/LogVisor
@@ -1 +1 @@
-Subproject commit 36c62436d24fb0d92ae470bfaf6a0de763626869
+Subproject commit 462971b134432330b30b60898d8c8b5c758bacb7
diff --git a/hecl/extern/RetroCommon b/hecl/extern/RetroCommon
index 6aa69f277..abb9d4c00 160000
--- a/hecl/extern/RetroCommon
+++ b/hecl/extern/RetroCommon
@@ -1 +1 @@
-Subproject commit 6aa69f27752355c77f7a5dfb2205d08b59815881
+Subproject commit abb9d4c0004daa0c892b7d81eb189549089f8cf2