diff --git a/src/draw.c b/src/draw.c
index 37b9ff4f..093aadac 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -3860,7 +3860,7 @@ void draw_graph(int i, const int flags, Graph_ctx *gr, void *ct)
       if(custom_rawfile[0]) {
         if(extra_rawfile(autoload, custom_rawfile, sim_type[0] ? sim_type : 
            (xctx->raw && xctx->raw->sim_type ? xctx->raw->sim_type : NULL), -1.0, -1.0) == 0) {
-          valid_rawfile = 0;
+          valid_rawfile = 0; 
         }
       }
       my_strdup2(_ALLOC_ID_, &nd, find_nth(ntok, "%", "\"", 0, 2));
diff --git a/src/netlist.c b/src/netlist.c
index 505b5ba9..c39947e5 100644
--- a/src/netlist.c
+++ b/src/netlist.c
@@ -1423,25 +1423,12 @@ static int name_unlabeled_instances()
   int i, j;
   xInstance * const inst = xctx->inst;
   int const instances = xctx->instances;
-  int rects, all_unconn;
+  int rects;
     
   /* name nets that do not touch ipin opin alias instances */
-  dbg(2, "name_unlabeled_instances(): naming nets that dont touch labels\n");
-  for (i = 0; i < instances; ++i)
-  {
-    if(!inst[i].node) continue;
-    if(skip_instance(i, 0, netlist_lvs_ignore)) continue;
-    if(inst[i].ptr != -1) {
-      rects=(inst[i].ptr+ xctx->sym)->rects[PINLAYER];
-      for(j = 0; j < rects; ++j) {
-        if(inst[i].node[j] == NULL)
-        {
-          err |= set_unnamed_inst(i, j);
-        }
-      }
-    }
-  }
-  #if 0 /* should never happen */
+
+  #if 0 /* does not work */
+  int all_unconn;
   for (i = 0; i < instances; ++i)
   {
     if(!inst[i].node) continue;
@@ -1466,7 +1453,21 @@ static int name_unlabeled_instances()
   }
   #endif
 
-
+  dbg(2, "name_unlabeled_instances(): naming nets that dont touch labels\n");
+  for (i = 0; i < instances; ++i)
+  {
+    if(!inst[i].node) continue;
+    if(skip_instance(i, 0, netlist_lvs_ignore)) continue;
+    if(inst[i].ptr != -1) {
+      rects=(inst[i].ptr+ xctx->sym)->rects[PINLAYER];
+      for(j = 0; j < rects; ++j) {
+        if(inst[i].node[j] == NULL)
+        {
+          err |= set_unnamed_inst(i, j);
+        }
+      }
+    }
+  }
   return err;
 }