diff --git a/VERSION b/VERSION
index a0b3453..64d3218 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.405
+1.0.406
diff --git a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__analog.gds b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__analog.gds
index ff79b8d..112822e 100644
--- a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__analog.gds
+++ b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__analog.gds
Binary files differ
diff --git a/sky130/magic/sky130.tech b/sky130/magic/sky130.tech
index 4c2173f..95d6a51 100644
--- a/sky130/magic/sky130.tech
+++ b/sky130/magic/sky130.tech
@@ -3032,33 +3032,33 @@
  and-not HVI,hvcheck
  grow 3000
 
- layer pfet POLY
+ layer pfet DIFF
  and diffresarea
- and DIFF
+ and POLY
  and-not NSDM
  and-not STDCELL
  and-not HVI
 
- layer mvpfet POLY
+ layer mvpfet DIFF
  and diffresarea
- and DIFF
+ and POLY
  and-not NSDM
  and-not STDCELL
  and HVI
 
- layer scpfet POLY
+ layer scpfet STDCELL
+ and POLY
  and diffresarea
  and DIFF
  and-not NSDM
  and-not HVTP
- and STDCELL
 
- layer scpfethvt POLY
+ layer scpfethvt STDCELL
+ and POLY
  and diffresarea
  and DIFF
  and-not NSDM
  and HVTP
- and STDCELL
 
 # End of resistor area hack
 
@@ -3078,6 +3078,9 @@
  and-not TAP
  and-not RPM
  and-not URPM
+ # Remove areas too small for a contact
+ shrink 130
+ grow 130
  copyup polycheck
 
  layer poly polyarea
@@ -3089,28 +3092,28 @@
  templayer xpolycheck polycheck
  copyup polycheck
 
- layer mrp1 POLY
- and POLYRES
+ layer mrp1 POLYRES
+ and POLY
  and-not RPM
  and-not URPM
  labels POLY
 
- layer rmp POLY
- and POLYSHORT
+ layer rmp POLYSHORT
+ and POLY
  labels POLY
 
- layer xhrpoly POLY
+ layer xhrpoly RPM
  and POLYRES
- and RPM
+ and POLY
  and-not URPM
  and PSDM
  and NPC
  and-not xpolyterm
  labels POLY
 
- layer uhrpoly POLY
+ layer uhrpoly URPM
  and POLYRES
- and URPM
+ and POLY
  and-not RPM
  and NPC
  and-not xpolyterm