diff --git a/src/hilight.c b/src/hilight.c
index 36a574ed..bd18c957 100644
--- a/src/hilight.c
+++ b/src/hilight.c
@@ -598,7 +598,7 @@ int search(const char *tok, const char *val, int sub, int sel)
  save_draw = xctx->draw_window;
  xctx->draw_window=1;
 #ifdef __unix__
- if(regcomp(&re, val , REG_EXTENDED)) return TCL_ERROR;
+ if(regcomp(&re, val , REG_NOSUB | REG_EXTENDED)) return TCL_ERROR;
 #endif
  dbg(1, "search():val=%s\n", val);
  if(!sel) {
diff --git a/xschem_library/devices/lab_pin.sym b/xschem_library/devices/lab_pin.sym
index 49e92097..27b7a3ef 100644
--- a/xschem_library/devices/lab_pin.sym
+++ b/xschem_library/devices/lab_pin.sym
@@ -3,7 +3,7 @@ v {xschem version=3.1.0 file_version=1.2
 G {}
 K {type=label
 format="*.alias @lab"
-template="name=l1 sig_type=std_logic lab=xxx"}
+template="name=p1 sig_type=std_logic lab=xxx"}
 V {}
 S {}
 E {}
diff --git a/xschem_library/devices/lab_wire.sym b/xschem_library/devices/lab_wire.sym
index c34c1528..48142477 100644
--- a/xschem_library/devices/lab_wire.sym
+++ b/xschem_library/devices/lab_wire.sym
@@ -3,7 +3,7 @@ v {xschem version=3.1.0 file_version=1.2
 G {}
 K {type=label
 format="*.alias @lab"
-template="name=l1 sig_type=std_logic lab=xxx"}
+template="name=p1 sig_type=std_logic lab=xxx"}
 V {}
 S {}
 E {}
diff --git a/xschem_library/examples/classD_amp.sch b/xschem_library/examples/classD_amp.sch
index 29f0ba96..b7851bac 100644
--- a/xschem_library/examples/classD_amp.sch
+++ b/xschem_library/examples/classD_amp.sch
@@ -405,7 +405,7 @@ C {vsource.sym} 280 -180 0 0 {name=V7 value="SIN ( 5 4 2000 0 0 0 )"
 C {lab_pin.sym} 280 -130 0 0 {name=p21 lab=VSS}
 C {lab_pin.sym} 280 -230 0 0 {name=p22 lab=IN}
 C {parax_cap.sym} 670 -360 0 0 {name=C4 gnd=0 value=200f m=1}
-C {ind.sym} 710 -920 1 0 {name=L1
+C {ind.sym} 710 -920 1 0 {name=L3
 m=1
 value=0.03m
 footprint=1206