diff --git a/chamsin/etc/technology.hcmos9.dtr.xml b/chamsin/etc/technology.hcmos9.dtr.xml
index f7d84d0c..d65062af 100644
--- a/chamsin/etc/technology.hcmos9.dtr.xml
+++ b/chamsin/etc/technology.hcmos9.dtr.xml
@@ -9,6 +9,8 @@
     <rule name="minSpacing"   layer="cut0" value="0.18" ref="19-2.a"/> 
     <arule name="minExtension" layer1="poly" layer2="cut0" value="0.07" ref="19-3"/> 
 
+    <arule name="minEnclosure" layer1="nWell" layer2="active" value="0.31" ref="1-4.a"/>
+
     <arule name="minGateEnclosure" layer1="nImplant" layer2="poly" value="0.4" ref="16-6"/>
     <arule name="minEnclosure" layer1="nImplant" layer2="poly" value="0.2" ref="16-17"/>
     <arule name="minExtension" layer1="nImplant" layer2="active" value="0.18" ref="16-8"/>
@@ -21,10 +23,10 @@
     <arule name="minExtension" layer1="pImplant" layer2="cut0" value="0.09" ref="19-4.b"/> 
     <arule name="minExtension" layer1="nImplant" layer2="cut0" value="0.09" ref="19-4.c"/> 
 
-    <rule name="minSpacing" layer1="active" layer2="cut0" value="0.14" ref="19-5"/>
+    <rule  name="minSpacing" layer1="active" layer2="cut0" value="0.14" ref="19-5"/>
     <arule name="minGateSpacing" layer1="cut0" layer2="active" value="0.11" ref="19-6.a"/>
-    <rule name="minSpacing" layer1="active" layer2="poly" value="0.07" ref="13-5"/>
-    <arule name="minSourceDrainWidth" layer1="active" layer2="poly" value="0.23" ref="13-6"/>
+    <rule  name="minSpacing" layer1="active" layer2="poly" value="0.07" ref="13-5"/>
+    <arule name="minExtension" layer1="active" layer2="poly" value="0.23" ref="13-6"/>
 
     <arule name="minExtension" layer1="poly" layer2="active" value="0.18" ref="13-7"/>
 
diff --git a/chamsin/src/CMakeLists.txt b/chamsin/src/CMakeLists.txt
index b45cd273..a0d8dff8 100644
--- a/chamsin/src/CMakeLists.txt
+++ b/chamsin/src/CMakeLists.txt
@@ -1,4 +1,3 @@
 ADD_SUBDIRECTORY(technology)
 ADD_SUBDIRECTORY(analogic)
-ADD_SUBDIRECTORY(device)
 ADD_SUBDIRECTORY(tests)