diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index ecdedc7132be53819df496afcabcc0dbe0c8a355..894cf57e5bae7d378791c507113c2efa12c407d1 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -2279,11 +2279,16 @@ int SystemInformationImplementation::QueryMemory()
 #elif _WIN32
 #if  _MSC_VER < 1300
   MEMORYSTATUS ms;
+  ms.dwLength = sizeof(ms);
   GlobalMemoryStatus(&ms);
 #define MEM_VAL(value) dw##value
 #else
   MEMORYSTATUSEX ms;
-  GlobalMemoryStatusEx(&ms);
+  ms.dwLength = sizeof(ms);
+  if (0 == GlobalMemoryStatusEx(&ms))
+  {
+    return 0;
+  }
 #define MEM_VAL(value) ull##value
 #endif
   unsigned long tv = ms.MEM_VAL(TotalVirtual);
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index d9e2333ed43d34bdfac1b7ade919969fd3b4c0cb..74fcadc75afa7267f5222b2b546a1397622cea6b 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2009)
 SET(KWSYS_DATE_STAMP_MONTH 11)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   16)
+SET(KWSYS_DATE_STAMP_DAY   18)