diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ef11031dd..34cde7194 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-14  Corinna Vinschen  <corinna@vinschen.de>
+
+	* ntdll.h: Fix copyright date.
+	* sec_acl.cc (acl_worker): delete allocated fhandler.
+	* syscalls.cc (chown_worker): Ditto.
+	(chmod): Ditto.
+	(stat_worker): Use get_namehash instead of hash_path_name.
+
 2004-04-14  Corinna Vinschen  <corinna@vinschen.de>
 
 	* sec_acl.cc (getacl): Avoid compiler warning.
diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h
index d82ce4971..2ecedcf01 100644
--- a/winsup/cygwin/ntdll.h
+++ b/winsup/cygwin/ntdll.h
@@ -1,6 +1,6 @@
 /* ntdll.h.  Contains ntdll specific stuff not defined elsewhere.
 
-   Copyright 2000, 2001, 2002, 2003 Red Hat, Inc.
+   Copyright 2000, 2001, 2002, 2003, 2004 Red Hat, Inc.
 
    This file is part of Cygwin.
 
diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec_acl.cc
index ed1446e2e..0e20a9fc5 100644
--- a/winsup/cygwin/sec_acl.cc
+++ b/winsup/cygwin/sec_acl.cc
@@ -421,6 +421,8 @@ acl_worker (const char *path, int cmd, int nentries, __aclent32_t *aclbufp,
     }
   else
     res = fh->facl (cmd, nentries, aclbufp);
+
+  delete fh;
   syscall_printf ("%d = acl (%s)", res, path);
   return res;
 }
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index d4fc77dfc..659f33185 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -837,6 +837,7 @@ chown_worker (const char *name, unsigned fmode, __uid32_t uid, __gid32_t gid)
   else
     res = fh->fchown (uid, gid);
 
+  delete fh;
   syscall_printf ("%d = %schown (%s,...)",
 		  res, (fmode & PC_SYM_NOFOLLOW) ? "l" : "", name);
   return res;
@@ -922,6 +923,7 @@ chmod (const char *path, mode_t mode)
   else
     res = fh->fchmod (mode);
 
+  delete fh;
   syscall_printf ("%d = chmod (%s, %p)", res, path, mode);
   return res;
 }
@@ -1070,7 +1072,7 @@ stat_worker (const char *name, struct __stat64 *buf, int nofollow)
       if (!res)
 	{
 	  if (!buf->st_ino)
-	    buf->st_ino = hash_path_name (0, fh->get_win32_name ());
+	    buf->st_ino = fh->get_namehash ();
 	  if (!buf->st_dev)
 	    buf->st_dev = fh->get_device ();
 	  if (!buf->st_rdev)