diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 3f2bbf3ebb..8edd888680 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 3f2bbf3ebb1e1ef23af25731c182a711b4102814
+Subproject commit 8edd8886803ab40f60dae6d7000ae4926ab4948f
diff --git a/ext/ghoul b/ext/ghoul
index af5545a13d..4d45a2fb68 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit af5545a13d140b15e7b37f581ea7dde522be2b5b
+Subproject commit 4d45a2fb68e6932c871c38ba210b6f04d5d91549
diff --git a/support/cmake/set_openspace_compile_settings.cmake b/support/cmake/set_openspace_compile_settings.cmake
index 2cfd0a2e97..433150c308 100644
--- a/support/cmake/set_openspace_compile_settings.cmake
+++ b/support/cmake/set_openspace_compile_settings.cmake
@@ -87,9 +87,11 @@ function (set_openspace_compile_settings target)
       "/GL" # Whole program optimization
     )
   else ()
-    set(MSVC_WARNINGS ${MSVC_WARNINGS}
-      "/ZI"       # Edit and continue support
-    )
+    if (GHOUL_ENABLE_EDIT_CONTINUE)
+      set(MSVC_WARNINGS ${MSVC_WARNINGS}
+        "/ZI"       # Edit and continue support
+      )
+    endif ()
   endif ()
 
   set(CLANG_WARNINGS