diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 66659206a..72f47f442 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-07  Christopher Faylor  <cgf@redhat.com>
+
+	* malloc.cc (DEFAULT_MMAP_THRESHOLD): Set high to avoid mmaps.
+
+2003-02-07  Christopher Faylor  <cgf@redhat.com>
+
+	* pipe.cc (fhandler_pipe::close): Avoid extraneous this->.
+
 2003-02-06  Christopher Faylor  <cgf@redhat.com>
 
 	* heap.cc (heap_init): Remove debugging code.
diff --git a/winsup/cygwin/malloc.cc b/winsup/cygwin/malloc.cc
index 2e0a5cce0..85965c068 100644
--- a/winsup/cygwin/malloc.cc
+++ b/winsup/cygwin/malloc.cc
@@ -1455,6 +1455,8 @@ void     public_mSTATs();
 
 #define M_MMAP_THRESHOLD      -3
 
+#define DEFAULT_MMAP_THRESHOLD (128 * 1024 * 1024)
+
 #ifndef DEFAULT_MMAP_THRESHOLD
 #define DEFAULT_MMAP_THRESHOLD (256 * 1024)
 #endif
diff --git a/winsup/cygwin/pipe.cc b/winsup/cygwin/pipe.cc
index 05b6c6f1d..f131fd43f 100644
--- a/winsup/cygwin/pipe.cc
+++ b/winsup/cygwin/pipe.cc
@@ -86,6 +86,7 @@ fhandler_pipe::read (void *in_ptr, size_t& in_len)
 int fhandler_pipe::close ()
 {
   int res = fhandler_base::close ();
+#undef guard
   if (guard)
     CloseHandle (guard);
   if (writepipe_exists)