diff --git a/VERSION b/VERSION
index 99d98ea..7e7e90e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.357
+1.0.358
diff --git a/gf180mcu/Makefile.in b/gf180mcu/Makefile.in
index 87fdfb8..ebc60d1 100644
--- a/gf180mcu/Makefile.in
+++ b/gf180mcu/Makefile.in
@@ -160,11 +160,14 @@
 # Path to GF180MCU library sources
 PDK_URL = https://github.com/google
 OSU_URL = https://github.com/stineje
+EF_URL = https://github.com/efabless
 
 # Names of library repositories
-PDK_LIB_PR =       ${PDK_URL}/globalfoundries-pdk-libs-gf180mcu_fd_pr
+# NOTE:  Switching PDK_LIB_PR and PDK_LIB_SC_7T5V0 to Efabless versions
+# having "quick fixes" under development.
+PDK_LIB_PR =       ${EF_URL}/globalfoundries-pdk-libs-gf180mcu_fd_pr
 PDK_LIB_IO =       ${PDK_URL}/globalfoundries-pdk-libs-gf180mcu_fd_io
-PDK_LIB_SC_7T5V0 = ${PDK_URL}/globalfoundries-pdk-libs-gf180mcu_fd_sc_mcu7t5v0
+PDK_LIB_SC_7T5V0 = ${EF_URL}/globalfoundries-pdk-libs-gf180mcu_fd_sc_mcu7t5v0
 PDK_LIB_SC_9T5V0 = ${PDK_URL}/globalfoundries-pdk-libs-gf180mcu_fd_sc_mcu9t5v0
 PDK_LIB_SRAM =     ${PDK_URL}/globalfoundries-pdk-ip-gf180mcu_fd_ip_sram
 PDK_LIB_OSU_SC =   ${OSU_URL}/globalfoundries-pdk-libs-gf180mcu_osu_sc
diff --git a/sky130/magic/sky130.tech b/sky130/magic/sky130.tech
index 8e5f3b4..82bb752 100644
--- a/sky130/magic/sky130.tech
+++ b/sky130/magic/sky130.tech
@@ -3759,6 +3759,7 @@
  templayer ndiccopy CONT
  and LI
  and DIODE
+ and DIFF
  and-not NWELL,nwelcheck
  and NSDM
  and-not LVTN
@@ -3775,6 +3776,7 @@
  templayer mvndiccopy CONT
  and LI
  and DIODE
+ and DIFF
  and-not NWELL,nwelcheck
  and NSDM
  and-not LVTN
@@ -3791,6 +3793,7 @@
  templayer pdiccopy CONT
  and LI
  and DIODE
+ and DIFF
  and PSDM
  and-not HVI,hvcheck
 
@@ -4519,9 +4522,9 @@
  surround pdic/a *pdi 60 directional \
 	"P-diode overlap of N-diode contact < %d in one direction (licon.5c)"
 
- surround nsc/a *nsd,corenvar 120 directional \
+ surround nsc/a *nsd,pdiff,corenvar 120 directional \
 	"N-tap overlap of N-tap contact < %d in one direction (licon.7)"
- surround psc/a *psd,corepvar 120 directional \
+ surround psc/a *psd,ndiff,corepvar 120 directional \
 	"P-tap overlap of P-tap contact < %d in one direction (licon.7)"
 
  surround mvndc/a *mvndiff,mvnfet,mvnfetesd,mvrnd 40 absence_illegal \