diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b767a0232..eeacb514a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+Sun Apr 16 18:54:21 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* init.cc (dll_entry): Use better check for determining when to set
+	thread specific stuff.
+	* syscalls.cc (_unlink): Continue with chmod'ing file even if
+	DELETE_ON_CLOSE succeeds, if file still exists.
+
 Fri Apr 14 23:51:15 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* fhandler_console.cc (keytable): Add support for keypad 5 key, which
diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc
index 0e660ac3c..e3809f73d 100644
--- a/winsup/cygwin/init.cc
+++ b/winsup/cygwin/init.cc
@@ -26,7 +26,7 @@ WINAPI dll_entry (HANDLE h, DWORD reason, void *static_load)
       dynamically_loaded = (static_load == NULL);
       break;
     case DLL_THREAD_ATTACH:
-      if (user_data->initial_sp)
+      if (user_data->threadinterface)
 	{
 	  if ( !TlsSetValue(user_data->threadinterface->reent_index,
                     &user_data->threadinterface->reents))
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 65583a330..16f3b48d7 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -91,8 +91,11 @@ _unlink (const char *ourname)
 	{
 	  CloseHandle (h);
 	  syscall_printf ("CreateFile/CloseHandle succeeded");
-	  res = 0;
-	  break;
+	  if (i > 0 || GetFileAttributes (win32_name) == (DWORD) -1)
+	    {
+	      res = 0;
+	      break;
+	    }
 	}
 
       if (i > 0)