diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c746a0930..2b6a105f1 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-29  Christopher Faylor  <cgf@timesys.com>
+
+	* autoload.cc (LoadDLLprime): Use a more descriptive name for autoload
+	text sections.
+	* cygwin.sc: Ditto.
+
 2005-06-27  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_disk_file.cc (fhandler_disk_file::facl): Add missing break.
diff --git a/winsup/cygwin/cygwin.sc b/winsup/cygwin/cygwin.sc
index 2a1776616..9270ab5e2 100644
--- a/winsup/cygwin/cygwin.sc
+++ b/winsup/cygwin/cygwin.sc
@@ -20,7 +20,7 @@ SECTIONS
   }
   .autoload_text ALIGN(__section_alignment__) :
   {
-    *(.*_text);
+    *(.*_autoload_text);
   }
   /* The Cygwin DLL uses a section to avoid copying certain data
      on fork.  This used to be named ".data".  The linker used
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index c0a55dc31..2d5d273df 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -1771,7 +1771,8 @@ semaphore::_timedwait (const struct timespec *abstime)
   struct timeval tv;
   long waitlength;
 
-  if (__check_invalid_read_ptr (abstime, sizeof *abstime))
+  myfault efault;
+  if (efault.faulted ())
     {
       /* According to SUSv3, abstime need not be checked for validity,
 	 if the semaphore can be locked immediately. */
@@ -3233,9 +3234,8 @@ semaphore::post (sem_t *sem)
 int
 semaphore::getvalue (sem_t *sem, int *sval)
 {
-
-  if (!is_good_object (sem)
-      || __check_null_invalid_struct (sval, sizeof (int)))
+  myfault efault;
+  if (efault.faulted () || !is_good_object (sem))
     {
       set_errno (EINVAL);
       return -1;