diff --git a/hecl/CMakeLists.txt b/hecl/CMakeLists.txt
index f4b1238f5..fd3cf2d2b 100644
--- a/hecl/CMakeLists.txt
+++ b/hecl/CMakeLists.txt
@@ -1,12 +1,16 @@
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) # because of CMAKE_CXX_STANDARD
 project(hecl)
+
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 if(MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
   # Shaddup MSVC
   add_definitions(-DUNICODE=1 -D_UNICODE=1 -D_CRT_SECURE_NO_WARNINGS=1 /wd4267 /wd4244)
 else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wno-multichar -fno-exceptions")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-multichar -fno-exceptions")
 endif()
 endif()
 
diff --git a/hecl/extern/athena b/hecl/extern/athena
index f10c7c0ee..b1f73f0c3 160000
--- a/hecl/extern/athena
+++ b/hecl/extern/athena
@@ -1 +1 @@
-Subproject commit f10c7c0ee3a6e7f7e553c589bbdc07642a61127a
+Subproject commit b1f73f0c337ad7fa040dfde8f6fdf7be53512875
diff --git a/hecl/extern/boo b/hecl/extern/boo
index 505f0fef7..4fbc8746b 160000
--- a/hecl/extern/boo
+++ b/hecl/extern/boo
@@ -1 +1 @@
-Subproject commit 505f0fef7365c4fb80ba0f5fcfa4509988f85acf
+Subproject commit 4fbc8746b0680b4f720cce3651e1157e1e1724e7