Index: src/fs/gnunet-helper-fs-publish.c
===================================================================
--- src/fs/gnunet-helper-fs-publish.c	(revision 21274)
+++ src/fs/gnunet-helper-fs-publish.c	(working copy)
@@ -186,6 +186,9 @@
 {
   struct GNUNET_MessageHeader hdr;
 
+  fprintf (stderr, "Helper sends %u-byte message of type %u\n",
+	   (unsigned int) (sizeof (struct GNUNET_MessageHeader) + data_length),
+	   (unsigned int) message_type);
   hdr.type = htons (message_type);
   hdr.size = htons (sizeof (struct GNUNET_MessageHeader) + data_length);
   if ( (GNUNET_OK !=
@@ -338,7 +341,7 @@
   ssize_t size;
   size_t slen;
 
-  if (item->is_directory == GNUNET_YES)
+  if (GNUNET_YES == item->is_directory)
   {
     /* for directories, we simply only descent, no extraction, no
        progress reporting */
Index: src/fs/fs_dirmetascan.c
===================================================================
--- src/fs/fs_dirmetascan.c	(revision 21274)
+++ src/fs/fs_dirmetascan.c	(working copy)
@@ -257,6 +257,9 @@
   const char *filename;
   size_t left;
 
+  fprintf (stderr, "DMS parses %u-byte message of type %u\n",
+	   (unsigned int) ntohs (msg->size),
+	   (unsigned int) ntohs (msg->type));
   left = ntohs (msg->size) - sizeof (struct GNUNET_MessageHeader);
   filename = (const char*) &msg[1];
   switch (ntohs (msg->type))
@@ -325,7 +328,7 @@
 			   NULL, GNUNET_SYSERR,
 			   GNUNET_FS_DIRSCANNER_ALL_COUNTED);
     ds->pos = ds->toplevel;
-    if (ds->pos->is_directory == GNUNET_YES)
+    if (GNUNET_YES == ds->pos->is_directory)
       ds->pos = advance (ds->pos);
     return;
   case GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_META_DATA: