diff --git a/ChangeLog b/ChangeLog
index f260ca3f..2f8dc7c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4662,6 +4662,8 @@ v0.33.20        10-Feb-2002
 		templates.
 		Changed the screen layout of menu 10.2 a bit as suggested by
 		Vince Coen.
+		Fixed a non understandable logmessage in check if nodes are
+		connected to file and or mail groups.
 
 	mbfido:
 		In AreaMgr and FileMgr changed aka matching for area 
diff --git a/TODO b/TODO
index fa82d6c5..8afe2d41 100644
--- a/TODO
+++ b/TODO
@@ -71,6 +71,10 @@ mbfile:
 
 	N: Rearc <area>
 
+	L: When files are moved from one area to another, the thumbnails
+	   are not moved. They are recreated later but this can be very
+	   time consuming.
+
 mbaff:
 	L: Add setup parameters for minimum length of keywords.
 
diff --git a/mbfido/createf.c b/mbfido/createf.c
index bd0e3dd6..9d34e12b 100644
--- a/mbfido/createf.c
+++ b/mbfido/createf.c
@@ -339,7 +339,16 @@ int CheckTicGroup(char *Area, int SendUplink, faddr *f)
 
     memset(&System, 0, sizeof(System));
     System.aka = fgroup.UpLink;
-    System.receivefrom = TRUE;
+    if (flow && !strcmp(flow, "*&"))
+	/*
+	 * Areas direction HQ's go the other way
+	 */
+	System.sendto = TRUE;
+    else
+	/*
+	 * Normal distribution areas.
+	 */
+	System.receivefrom = TRUE;
     fwrite(&System, sizeof(System), 1, mp);
     memset(&System, 0, sizeof(System));
     for (i = 1; i < (tichdr.syssize / sizeof(System)); i++)
diff --git a/mbsetup/m_node.c b/mbsetup/m_node.c
index 14180079..0913ebeb 100644
--- a/mbsetup/m_node.c
+++ b/mbsetup/m_node.c
@@ -296,25 +296,24 @@ int GroupInNode(char *Group, int Mail)
 {
 	char	temp[PATH_MAX], group[13];
 	FILE	*no;
-	int	i, groups, Area = 0, RetVal = 0;
+	int	i, groups, RetVal = 0;
 
 	sprintf(temp, "%s/etc/nodes.data", getenv("MBSE_ROOT"));
 	if ((no = fopen(temp, "r")) == NULL)
-		return FALSE;
+		return 0;
 
 	fread(&nodeshdr, sizeof(nodeshdr), 1, no);
 	fseek(no, 0, SEEK_SET);
 	fread(&nodeshdr, nodeshdr.hdrsize, 1, no);
 
 	while ((fread(&nodes, nodeshdr.recsize, 1, no)) == 1) {
-		Area++;
 		groups = nodeshdr.filegrp / sizeof(group);
 		for (i = 0; i < groups; i++) {
 			fread(&group, sizeof(group), 1, no);
 			if (strlen(group) && !Mail) {
 				if (!strcmp(group, Group)) {
 					RetVal++;
-					Syslog('-', "File group %s in %d: %s", Group, Area, aka2str(nodes.Aka[0]));
+					Syslog('-', "File group %s found in node setup %s", Group, aka2str(nodes.Aka[0]));
 				}
 			}
 		}
@@ -324,7 +323,7 @@ int GroupInNode(char *Group, int Mail)
 			if (strlen(group) && Mail) {
 				if (!strcmp(group, Group)) {
 					RetVal++;
-					Syslog('-', "Mail group %s found in %d: %s", Group, Area, aka2str(nodes.Aka[0]));
+					Syslog('-', "Mail group %s found in node setup %s", Group, aka2str(nodes.Aka[0]));
 				}
 			}
 		}