diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a263685182e8d7a106bb9897b3feeb0b988d3e5..2be4ca0e04d84813db790611996dc5ff69dbd705 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1359,7 +1359,8 @@ if(WIN32 AND NOT MSVC OR CYGWIN)
     set(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS)
   endif(ENABLE_BUILD_DYNAMIC)
 elseif(MSVC)
-  set_target_properties(gmsh PROPERTIES LINK_FLAGS "/STACK:16777216")
+  set_target_properties(gmsh PROPERTIES LINK_FLAGS
+    "/STACK:16777216 /SAFESEH:NO")
 endif(WIN32 AND NOT MSVC OR CYGWIN)
 
 # parser target
diff --git a/utils/nightly/gmsh.ctest b/utils/nightly/gmsh.ctest
index e727ea860822b660137636e3b7f0f23586d82be9..8d40edc46ab128cd6b3ad8ef28747627a3262f88 100644
--- a/utils/nightly/gmsh.ctest
+++ b/utils/nightly/gmsh.ctest
@@ -25,8 +25,11 @@ set(CTEST_UPDATE_COMMAND "${CTEST_SVN_COMMAND}")
 
 set(CTEST_CONFIGURE_COMMAND 
     "${CTEST_CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}")
-set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} ${CTEST_BUILD_OPTIONS}")
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"-G${CTEST_CMAKE_GENERATOR}\"")
+set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} ${CTEST_BUILD_OPTIONS}")
+if(CTEST_BUILD_OPTIONS_QUOTED)
+  set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_BUILD_OPTIONS_QUOTED}\"")
+endif(CTEST_BUILD_OPTIONS_QUOTED)
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_SOURCE_DIRECTORY}\"")
 
 # make sure everybody outputs messages in english
diff --git a/utils/nightly/gmsh_msvc.ctest b/utils/nightly/gmsh_msvc.ctest
index f2ff00473290ae40153762ecd235df747b60c4e3..d5e887144fa9df039ed53e12aa05c57f389ad5d9 100644
--- a/utils/nightly/gmsh_msvc.ctest
+++ b/utils/nightly/gmsh_msvc.ctest
@@ -3,7 +3,7 @@
 # See the LICENSE.txt file for license information. Please report all
 # bugs and problems to the public mailing list <gmsh@geuz.org>.
 
-set(CTEST_CMAKE_COMMAND "'C:\Program Files (x86)\CMake 2.8\bin\cmake.exe'")
+set(CTEST_CMAKE_COMMAND "C:/Program Files (x86)/CMake 2.8/bin/cmake.exe")
 set(CTEST_BINARY_DIRECTORY "$ENV{HOME}/src/gmsh/bin_msvc")
 set(CTEST_CMAKE_GENERATOR "Visual Studio 11")
 
@@ -16,8 +16,8 @@ set(WITH_MEMCHECK FALSE) # check memory with valgrind?
 #################################################################################
 set(CTEST_BUILD_NAME "Win64-msvc")
 set(OPT "-DGMSH_EXTRA_VERSION=${EXTRA_VERSION}")
-### set(OPT "${OPT} -DCMAKE_PREFIX_PATH='c:/Program Files/Intel/MKL/10.0.4.023'")
-set(OPT "${OPT} -DENABLE_FLTK=0 -DENABLE_BLAS_LAPACK=0")
-set(CTEST_BUILD_OPTIONS ${OPT})
+set(OPT "${OPT} -DENABLE_FLTK=0")
+set(CTEST_BUILD_OPTIONS "${OPT}")
+set(CTEST_BUILD_OPTIONS_QUOTED "-DCMAKE_PREFIX_PATH:path=C:/Program Files/Intel/MKL/10.0.4.023/")
 include(gmsh.ctest)
 ### upload_package(${WEB_BIN} Windows 64-msvc .zip .zip)