diff --git a/contrib/platform/win32/CMakeModules/ompi_configure.cmake b/contrib/platform/win32/CMakeModules/ompi_configure.cmake
index 063620ca4f..885bef60f5 100644
--- a/contrib/platform/win32/CMakeModules/ompi_configure.cmake
+++ b/contrib/platform/win32/CMakeModules/ompi_configure.cmake
@@ -251,6 +251,8 @@ OMPI_DEF_OPT(ORTE_WANT_NOTIFIER_LOG_EVENT "if the notifier_log_event should be e
 
 OMPI_DEF_OPT(OMPI_WANT_OFED "Whether we want to enable OFED support." ON)
 
+OMPI_DEF_OPT(OPAL_ENABLE_CRDEBUG "Whether we want checkpoint/restart enabled debugging functionality or not." OFF)
+
 IF (NOT MSVC)
 
 ###################################################################
@@ -625,6 +627,7 @@ OMPI_F77_CHECK("REAL*16" "no" "float;double;long double" "16")
 OMPI_F77_CHECK("DOUBLE PRECISION" "yes" "float;double;long double" "-1")
 
 OMPI_F77_CHECK("COMPLEX" "yes" "" "-1")
+OMPI_F77_CHECK("DOUBLE COMPLEX" "yes" "" "-1")
 
 # The complex*N tests are a bit different (note: the complex tests are
 # the same as all the rest, because complex is a composite of two
diff --git a/ompi/mpiext/cr/c/migrate.c b/ompi/mpiext/cr/c/migrate.c
index ff7bcae8c2..00c0024c4a 100644
--- a/ompi/mpiext/cr/c/migrate.c
+++ b/ompi/mpiext/cr/c/migrate.c
@@ -65,10 +65,10 @@ int OMPI_CR_Migrate(MPI_Comm comm, char *hostname, int rank, MPI_Info *info)
 
     if( 0 == my_rank ) {
         datum->mig_num = my_size;
-        datum->mig_vpids = malloc(sizeof(int) * my_size);
-        datum->mig_host_pref = malloc(sizeof(char) * my_size * MPI_MAX_PROCESSOR_NAME);
-        datum->mig_vpid_pref = malloc(sizeof(int) * my_size);
-        datum->mig_off_node  = malloc(sizeof(int) * my_size);
+        datum->mig_vpids = (int *) malloc(sizeof(int) * my_size);
+        datum->mig_host_pref = (char (*)[OPAL_MAX_PROCESSOR_NAME]) malloc(sizeof(char) * my_size * MPI_MAX_PROCESSOR_NAME);
+        datum->mig_vpid_pref = (int *) malloc(sizeof(int) * my_size);
+        datum->mig_off_node  = (int *) malloc(sizeof(int) * my_size);
 
         for( i = 0; i < my_size; ++i ) {
             (datum->mig_vpids)[i] = 0;
diff --git a/opal/mca/compress/base/.windows b/opal/mca/compress/base/.windows
new file mode 100644
index 0000000000..00ac6ca144
--- /dev/null
+++ b/opal/mca/compress/base/.windows
@@ -0,0 +1,11 @@
+#
+# Copyright (c) 2009      High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+exclude_list=compress_base_fns.c