diff --git a/CMakeLists.txt b/CMakeLists.txt
index b96af47c4..399071a55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -730,7 +730,7 @@ ENDIF()
 # By default, MSVC has a stack size of 1000000.
 # Allow a user to override this.
 IF(MSVC)
-  SET(NC_MSVC_STACK_SIZE 1000000 CACHE STRING "Default stack size for MSVC-based projects.")
+  SET(NC_MSVC_STACK_SIZE 40000000 CACHE STRING "Default stack size for MSVC-based projects.")
   
   # By default, CMake sets the stack to 1000000.
   # Remove this limitation.
diff --git a/config.h.in.cmake b/config.h.in.cmake
index 2488e5900..6c892663b 100644
--- a/config.h.in.cmake
+++ b/config.h.in.cmake
@@ -4,6 +4,10 @@
 /* Eliminate a number of warnings which come up based on deprecated
    POSIX naming conventions. */
 #ifdef _MSC_VER
+
+/* Define O_BINARY so that the appropriate flags
+are set when opening a binary file on Windows. */
+
 /* Disable a few warnings under Visual Studio, for the
    time being. */
   #include <io.h>
@@ -13,7 +17,8 @@
   #define close _close
   #define read _read
   #define lseek _lseeki64
-  
+  #define fstat _fstati64
+
   #define off_t __int64
   #define _off_t __int64