diff --git a/hecl/CMakeLists.txt b/hecl/CMakeLists.txt
index 07d5c9360..85018ec90 100644
--- a/hecl/CMakeLists.txt
+++ b/hecl/CMakeLists.txt
@@ -1,9 +1,10 @@
 cmake_minimum_required(VERSION 3.0)
 project(hecl)
 if(MSVC)
-add_definitions(-DUNICODE=1 -D_UNICODE=1 -D_CRT_SECURE_NO_WARNINGS=1 /wd4267 /wd4244)
+  # 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++11 -Wno-multichar -fno-exceptions")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-multichar -fno-exceptions")
 endif()
 list(APPEND HECL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/blender)
 set(ATHENA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extern/Athena/include)
diff --git a/hecl/extern/Athena b/hecl/extern/Athena
index 12e759663..c53db2d74 160000
--- a/hecl/extern/Athena
+++ b/hecl/extern/Athena
@@ -1 +1 @@
-Subproject commit 12e7596639a89abfb3557393d746471a9d5aabba
+Subproject commit c53db2d74dab631ec8c43619f43fc4891d73f293
diff --git a/hecl/extern/RetroCommon b/hecl/extern/RetroCommon
index df2adc10d..a3db545b0 160000
--- a/hecl/extern/RetroCommon
+++ b/hecl/extern/RetroCommon
@@ -1 +1 @@
-Subproject commit df2adc10da511f0be94214eae58d2f8075fb3842
+Subproject commit a3db545b01a8c77e4ec579dda4402e9e67bfde6c