diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b1137280e..747d01733 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-17  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* pipe.cc (fhandler_pipe::create_selectable): Add -pipe to default pipe names.
+
+	* lib/_cygwin_crt0_common.cc (_cygwin_crt0_common): Use bool/true/false
+	for what is actually a boolean variable.
+
 2009-08-14  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_disk_file.cc (fhandler_disk_file::readdir): Fix length
diff --git a/winsup/cygwin/lib/_cygwin_crt0_common.cc b/winsup/cygwin/lib/_cygwin_crt0_common.cc
index 23cedfaaa..648d54aac 100644
--- a/winsup/cygwin/lib/_cygwin_crt0_common.cc
+++ b/winsup/cygwin/lib/_cygwin_crt0_common.cc
@@ -71,16 +71,16 @@ _cygwin_crt0_common (MainFunc f, per_process *u)
   /* This is used to record what the initial sp was.  The value is needed
      when copying the parent's stack to the child during a fork.  */
   per_process *newu = (per_process *) cygwin_internal (CW_USER_DATA);
-  int uwasnull;
+  bool uwasnull;
 
   /* u is non-NULL if we are in a DLL, and NULL in the main exe.
      newu is the Cygwin DLL's internal per_process and never NULL.  */
   if (u != NULL)
-    uwasnull = 0;	/* Caller allocated space for per_process structure.  */
+    uwasnull = false;	/* Caller allocated space for per_process structure.  */
   else
     {
       u = newu;		/* Using DLL built-in per_process.  */
-      uwasnull = 1;	/* Remember for later.  */
+      uwasnull = true;	/* Remember for later.  */
     }
 
   /* The version numbers are the main source of compatibility checking.
diff --git a/winsup/cygwin/pipe.cc b/winsup/cygwin/pipe.cc
index a694bceef..5e557d8c6 100644
--- a/winsup/cygwin/pipe.cc
+++ b/winsup/cygwin/pipe.cc
@@ -228,7 +228,7 @@ fhandler_pipe::create_selectable (LPSECURITY_ATTRIBUTES sa_ptr, HANDLE& r,
     {
       static volatile ULONG pipe_unique_id;
       if (!name)
-	__small_sprintf (pipename + strlen(PIPE_INTRO), "%p-%p", myself->pid,
+	__small_sprintf (pipename + strlen(PIPE_INTRO), "pipe-%p-%p", myself->pid,
 			InterlockedIncrement ((LONG *) &pipe_unique_id));
       else
 	strcpy (pipename + strlen(PIPE_INTRO), name);