diff --git a/VERSION b/VERSION
index 6635c799..bc573855 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.2.203
+8.2.204
diff --git a/calma/CalmaWrite.c b/calma/CalmaWrite.c
index b610f6bc..1d65a5fa 100644
--- a/calma/CalmaWrite.c
+++ b/calma/CalmaWrite.c
@@ -451,7 +451,7 @@ calmaDumpStructure(def, outf, calmaDefHash, filename)
 	    chklibname = (char *)DBPropGet(edef, "GDS_FILE", &isReadOnly);
 
 	    /* Is the library name the same? */
-	    if (isAbstract && !strcmp(filename, chklibname))
+	    if (isAbstract && isReadOnly && !strcmp(filename, chklibname))
 	    {
 		/* Same library, so keep the cellname and mark the cell */
 		/* as having been written to GDS.			*/
diff --git a/resis/ResSimple.c b/resis/ResSimple.c
index f55b0845..7c7bc23f 100644
--- a/resis/ResSimple.c
+++ b/resis/ResSimple.c
@@ -750,7 +750,16 @@ ResCalculateChildCapacitance(me)
      for (tptr = me->rn_te; tptr != NULL; tptr = tptr->te_nextt)
      {
      	  dev = tptr->te_thist;
-	  t = TiGetType(dev->rd_tile);
+	  /* Hack for non-Manhattan geometry.  Only one side of a split	*/
+	  /* tile should correspond to a device type.			*/
+	  if (IsSplit(dev->rd_tile))
+	  {
+	      t = TiGetLeftType(dev->rd_tile);
+	      if (ExtCurStyle->exts_device[t] == NULL)
+		  t = TiGetRightType(dev->rd_tile);
+	  }
+	  else
+	      t = TiGetType(dev->rd_tile);
 	  if (dev->rd_fet_gate == me)
 	  {
 	       devptr = ExtCurStyle->exts_device[t];