diff --git a/README.dev b/README.dev
index 70970aa5ac633891cfba17935ce0ab839655654d..60033d4ef638121428d66bdf7e8acd68611a138d 100644
--- a/README.dev
+++ b/README.dev
@@ -111,8 +111,9 @@ To make a new release:
      7.0.3	 r2963	     ee145f2
      7.0.4	 r2991	     fcc8509
      7.0.5                   0ab79ad
+     7.0.6                   
 
- 10) increase the version number in configure.ac and build.vc*/gen_ecm_h.bat,
+ 10) increase the version number in configure.ac and build.vs/gen_ecm_h.bat,
      and switch assertions to on by default in configure.ac.
 
 To see the differences between a given tag and the current version:
diff --git a/build.vs/gen_ecm_h.bat b/build.vs/gen_ecm_h.bat
index 3a65758bad116cb98395036d018c37f8bca6a07d..7685ea1b5d5b3c94958a3b565c39effd302a8521 100644
--- a/build.vs/gen_ecm_h.bat
+++ b/build.vs/gen_ecm_h.bat
@@ -5,7 +5,7 @@ echo /* generated from ecm-h.in by gen_ecm_h.bat */>tmp.h
 for /f "tokens=1,2*" %%a in (..\ecm.h.in) do (
   if "%%a" EQU "#undef" (
     if "%%b" EQU "ECM_VERSION" (
-      echo #define ECM_VERSION "7.0.6-rc2">>tmp.h
+      echo #define ECM_VERSION "7.0.6">>tmp.h
     )
   ) else echo %%a %%b %%c>>tmp.h
 )
diff --git a/cgbn_stage1.cu b/cgbn_stage1.cu
index 68ae0e90516be1c6afdcbda7b4244b7ecf1e1381..77e66ef32c87fae26b56d0bd179c09b80198ffc3 100644
--- a/cgbn_stage1.cu
+++ b/cgbn_stage1.cu
@@ -134,7 +134,9 @@ class cgbn_params_t {
   static const uint32_t TPB=TPB_DEFAULT;           // Reasonable default
   static const uint32_t MAX_ROTATION=4;            // good default value
   static const uint32_t SHM_LIMIT=0;               // no shared mem available
+#ifndef _MSC_VER
   static const bool     CONSTANT_TIME=false;       // not implemented
+#endif
 
   // parameters used locally in the application
   static const uint32_t TPI=tpi;                   // threads per instance
diff --git a/configure.ac b/configure.ac
index 37c8070aa40da8ecdf55b2ed0a0a8a13d47048f4..fcd56a5069d772bc3c7dc5e85053a3dccf7dd9c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-m4_define([ECM_VERSION_AC], [7.0.6-rc2])
+m4_define([ECM_VERSION_AC], [7.0.6])
 
 AC_PREREQ([2.57])
 AC_INIT([ecm],[ECM_VERSION_AC],[ecm-discuss@inria.fr])
@@ -65,7 +65,7 @@ AC_ARG_ENABLE([assert],
 [AS_HELP_STRING([--enable-assert], [enable ASSERT checking [[default=no]]])],[],[enable_assert=no])
 if test "x$enable_assert" = xyes; then
   AC_DEFINE([WANT_ASSERT],1,[Define to 1 if you want assertions enabled])
-  GMP_DEFINE([WANT_ASSERT], 0)
+  GMP_DEFINE([WANT_ASSERT], 1)
 fi
 
 AC_ARG_ENABLE([gmp-cflags],