diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54dbc7f46..b114a4f63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
 include_directories(/usr/local/include)
 endif()
 
-if(${CMAKE_BUILD_TYPE} STREQUAL "Release" AND ${CMAKE_SYSTEM_NAME} STREQUAL Linux)
+if(${CMAKE_BUILD_TYPE} AND ${CMAKE_BUILD_TYPE} STREQUAL "Release" AND ${CMAKE_SYSTEM_NAME} STREQUAL Linux)
   option(USE_LD_GOLD "Link with GNU Gold and enable LTO" ON)
 else()
   option(USE_LD_GOLD "Link with GNU Gold and enable LTO" OFF)
diff --git a/hecl b/hecl
index 239806060..3383321c7 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 239806060918b7d1eaa59add2f0486ae59963d42
+Subproject commit 3383321c7c0176e2adef45c6db963434bc3325d7
diff --git a/libSpecter b/libSpecter
index 9dc2406fe..1d313676f 160000
--- a/libSpecter
+++ b/libSpecter
@@ -1 +1 @@
-Subproject commit 9dc2406fe39a2b30a4ded1af3ec460e47dbd7776
+Subproject commit 1d313676fbef851cacee62ac83dd53ee89606dc0