diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9093fba..e41e9a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,7 @@ set(BASALT_CXX_FLAGS "-Wall -Wextra -Werror -Wno-error=unused-parameter -ftempla
 
 # clang-specific compile flags
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-  set(BASALT_CXX_FLAGS "${BASALT_CXX_FLAGS} -Wno-exceptions -fcolor-diagnostics -Wno-error=deprecated-declarations")
+  set(BASALT_CXX_FLAGS "${BASALT_CXX_FLAGS} -Wno-exceptions -fcolor-diagnostics -frelaxed-template-template-args -Wno-error=deprecated-declarations")
 else()
   set(BASALT_CXX_FLAGS "${BASALT_CXX_FLAGS} -Wno-error=maybe-uninitialized")
 endif()
diff --git a/README.md b/README.md
index e8ba4d8..8e30bd7 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,8 @@ This project contains tools for:
 
 Some reusable components of the system are availble as a separate [header-only library](https://gitlab.com/VladyslavUsenko/basalt-headers) ([Documentation](https://vladyslavusenko.gitlab.io/basalt-headers/)).
 
+There is also a [Github mirror](https://github.com/VladyslavUsenko/basalt-mirror) of this project to enable easy forking.
+
 ## Related Publications
 Visual-Inertial Odometry and Mapping:
 * **Visual-Inertial Mapping with Non-Linear Factor Recovery**, V. Usenko, N. Demmel, D. Schubert, J. Stückler, D. Cremers, In [[arXiv:1904.06504]](https://arxiv.org/abs/1904.06504).
diff --git a/thirdparty/basalt-headers b/thirdparty/basalt-headers
index fa1a74d..946f6d2 160000
--- a/thirdparty/basalt-headers
+++ b/thirdparty/basalt-headers
@@ -1 +1 @@
-Subproject commit fa1a74dfa8f8400b8e1b260c6f6b4c9ce59ed776
+Subproject commit 946f6d27ad10c8df6f8a8bc1ab9e619ae3b46c14