diff --git a/VERSION b/VERSION
index f70928e1..abe35e8c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.398
+8.3.399
diff --git a/calma/CalmaRdcl.c b/calma/CalmaRdcl.c
index bdbbf45c..f99b800c 100644
--- a/calma/CalmaRdcl.c
+++ b/calma/CalmaRdcl.c
@@ -1374,7 +1374,8 @@ calmaFindCell(name, was_called, predefined)
 	     * if the cell is used in a parent before being defined
 	     * then it will cause a core dump.
 	     */
-	     DBReComputeBbox(def);
+	    DBReComputeBbox(def);
+	    if (was_called) *was_called = FALSE;
 	}
 	else
 	{
@@ -1385,9 +1386,9 @@ calmaFindCell(name, was_called, predefined)
 		if (predefined) *predefined = TRUE;
 	    	TxPrintf("Using pre-existing cell definition\n");
 	    }
+	    if (was_called) *was_called = TRUE;
 	}
 	HashSetValue(h, def);
-	if (was_called) *was_called = FALSE;
     }
     else
     {
diff --git a/extflat/EFbuild.c b/extflat/EFbuild.c
index 021f5343..81fc7a29 100644
--- a/extflat/EFbuild.c
+++ b/extflat/EFbuild.c
@@ -1789,7 +1789,7 @@ efNodeMerge(node1ptr, node2ptr)
 
     /* Sanity check: ignore if same node */
     if (*node1ptr == *node2ptr)
-	return;
+	return NULL;
 
     /* Keep the node with the greater number of entries, and merge  */
     /* the node with fewer entries into it.			    */