diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index bc452087f..4675055d5 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -776,7 +776,9 @@ tags:  CTAGS
 CTAGS:
 	-cd $(srcdir) && \
 	ctags -R --c++-kinds=+p --fields=+iaS --extra=+q \
-	--regex-C++='/EXPORT_ALIAS *\([[a-zA-Z0-9_]*, *([a-zA-Z0-9_]*)\)/\1/' \
+	--regex-C++='/EXPORT_ALIAS *\([a-zA-Z0-9_]*, *([a-zA-Z0-9_]*)\)/\1/' \
+	--regex-C++='/_EXFUN *\(([a-zA-Z0-9_]*)[,\)]/\1/' \
+	--regex-C++='/__ASMNAME *\("([a-zA-Z0-9_]*)"\)/\1/' \
 	@newlib_headers@ .
 
 deps:=${wildcard *.d}
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 5dfcae4d9..149c80484 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -1635,8 +1635,10 @@ fhandler_disk_file::pwrite (void *buf, size_t count, off_t offset)
 
       if (!prw_handle && prw_open (true))
 	goto non_atomic;
+      debug_printf ("Before NtWriteFile, io %Y", io.Information);
       status = NtWriteFile (prw_handle, NULL, NULL, NULL, &io, buf, count,
 			    &off, NULL);
+      debug_printf ("After NtWriteFile, io %Y, status %y", io.Information);
       if (!NT_SUCCESS (status))
 	{
 	  __seterrno_from_nt_status (status);