diff --git a/sky130/magic/sky130.magicrc b/sky130/magic/sky130.magicrc
index feaf6b5..22e1faa 100644
--- a/sky130/magic/sky130.magicrc
+++ b/sky130/magic/sky130.magicrc
@@ -16,7 +16,7 @@
 drc euclidean on
 
 # Allow override of PDK path from environment variable PDKPATH
-if {[catch {set PDKPATH $env(PDKPATH)}]} {
+if {[catch {set PDKPATH $::env(PDKPATH)}]} {
     set PDKPATH "STAGING_PATH/TECHNAME"
 }
 
@@ -44,7 +44,7 @@
 # Allow override of type of magic library views used, "mag" or "maglef",
 # from environment variable MAGTYPE
 
-if {[catch {set MAGTYPE $env(MAGTYPE)}]} {
+if {[catch {set MAGTYPE $::env(MAGTYPE)}]} {
    set MAGTYPE maglef
 }
 
@@ -79,7 +79,7 @@
 
 # add path to GDS cells
 #ifdef FULLTECH
-if {[file isdir ${PDKPATH}/libs.ref/gds}]} {
+if {[file isdir ${PDKPATH}/libs.ref/gds]} {
     path cell ${PDKPATH}/libs.ref/gds/sky130_fd_pr_base
     path cell ${PDKPATH}/libs.ref/gds/sky130_fd_pr_rf
     path cell ${PDKPATH}/libs.ref/gds/sky130_fd_pr_rf2
diff --git a/sky130/netgen/sky130_setup.tcl b/sky130/netgen/sky130_setup.tcl
index af90784..bb5c574 100644
--- a/sky130/netgen/sky130_setup.tcl
+++ b/sky130/netgen/sky130_setup.tcl
@@ -230,18 +230,18 @@
 #---------------------------------------------------------------
 
 foreach cell $cells1 {
-    if {[regexp "sky130_fc_sc_hd_decap_\[0-9\]+" $cell match]} {
+    if {[regexp {sky130_fd_sc_\w\w__decap_[[:digit:]]+} $cell match]} {
         ignore class "-circuit1 $cell"
     }
-    if {[regexp "sky130_fc_sc_hd_fill_\[0-9\]+" $cell match]} {
+    if {[regexp {sky130_fd_sc_\w\w__fill_[[:digit:]]+} $cell match]} {
         ignore class "-circuit1 $cell"
     }
 }
 foreach cell $cells2 {
-    if {[regexp "sky130_fc_sc_hd_decap_\[0-9\]+" $cell match]} {
+    if {[regexp {sky130_fd_sc_\w\w__decap_[[:digit:]]+} $cell match]} {
         ignore class "-circuit2 $cell"
     }
-    if {[regexp "sky130_fc_sc_hd_fill_\[0-9\]+" $cell match]} {
+    if {[regexp {sky130_fd_sc_\w\w__fill_[[:digit:]]+} $cell match]} {
         ignore class "-circuit2 $cell"
     }
 }
@@ -257,6 +257,7 @@
 #---------------------------------------------------------------
 # e.g., hydra_spi_controller__hydra_spi_controller
 #---------------------------------------------------------------
+
 foreach cell $cells1 {
     if {[regexp "(.+)__(.+)" $cell match library cellname]} {
         if {([lsearch $cells2 $cell] < 0) && \