diff --git a/ext2spice/ext2hier.c b/ext2spice/ext2hier.c
index 82099cd5..faacbc55 100644
--- a/ext2spice/ext2hier.c
+++ b/ext2spice/ext2hier.c
@@ -1299,12 +1299,11 @@ char *nodeSpiceHierName(hc, hname)
     HierName *hname;
 {
     EFNodeName *nn;
-    HashEntry *he;
+    HashEntry *he, *he2;
     EFNode *node;
     Def *def = hc->hc_use->use_def;
 
-    // he = HashLookOnly(&def->def_nodes, EFHNToStr(hname));
-    he = HashLookOnly(&efNodeHashTable, (char *)hname);
+    he = EFHNLook(hname, NULL, "ext2spice");
     if (he == NULL) return "error";
 
     nn = (EFNodeName *) HashGetValue(he);
diff --git a/extflat/EFbuild.c b/extflat/EFbuild.c
index 96148a66..061dd12d 100644
--- a/extflat/EFbuild.c
+++ b/extflat/EFbuild.c
@@ -1632,6 +1632,8 @@ efNodeMerge(node1, node2)
      */
     if (node2->efnode_flags & EF_PORT)
 	node1->efnode_flags |= EF_PORT;
+    if (node2->efnode_flags & EF_TOP_PORT)
+	node1->efnode_flags |= EF_TOP_PORT;
 
     /*
      * If node2 has the EF_SUBS_NODE flag set, then copy the port