diff --git a/src/spicelib/devices/bsim4v6/b4v6check.c b/src/spicelib/devices/bsim4v6/b4v6check.c
index d78af90be..5c01820a6 100644
--- a/src/spicelib/devices/bsim4v6/b4v6check.c
+++ b/src/spicelib/devices/bsim4v6/b4v6check.c
@@ -55,7 +55,7 @@ CKTcircuit *ckt)
     wl = wlstart = TMALLOC(wordlist, 1);
     wl->wl_prev = NULL;
     wl->wl_next = NULL;
-    wl->wl_word = tprintf("\nChecking parameters for BSIM 4.5 model %s\n", model->BSIM4v6modName);
+    wl->wl_word = tprintf("\nChecking parameters for BSIM 4.6 model %s\n", model->BSIM4v6modName);
 
     if ((here->BSIM4v6rgateMod == 2) || (here->BSIM4v6rgateMod == 3))
     {   if ((here->BSIM4v6trnqsMod == 1) || (here->BSIM4v6acnqsMod == 1)) {
diff --git a/src/spicelib/devices/dio/dioload.c b/src/spicelib/devices/dio/dioload.c
index 65a88b82a..9c3aa3f00 100644
--- a/src/spicelib/devices/dio/dioload.c
+++ b/src/spicelib/devices/dio/dioload.c
@@ -435,7 +435,7 @@ next1:
 
                 diffcharge = here->DIOtTransitTime*cd;
                 *(ckt->CKTstate0 + here->DIOcapCharge) =
-                        diffcharge + deplcharge + deplchargeSW;
+                        diffcharge + deplcharge + deplchargeSW + (here->DIOcmetal + here->DIOcpoly)*vd;
 
                 diffcap = here->DIOtTransitTime*gd;
 
diff --git a/src/spicelib/devices/dio/diompar.c b/src/spicelib/devices/dio/diompar.c
index 8c06b4bfc..e68052eb0 100644
--- a/src/spicelib/devices/dio/diompar.c
+++ b/src/spicelib/devices/dio/diompar.c
@@ -263,11 +263,11 @@ DIOmParam(int param, IFvalue *value, GENmodel *inModel)
             model->DIOwidthPolyGiven = TRUE;
             break;
         case DIO_MOD_XOM:
-            model->DIOmetalOxideThick = value->rValue * 1e-10; /* m */
+            model->DIOmetalOxideThick = value->rValue * 1e-10; /* Angstrom -> m */
             model->DIOmetalOxideThickGiven = TRUE;
             break;
         case DIO_MOD_XOI:
-            model->DIOpolyOxideThick = value->rValue * 1e-10; /* m */
+            model->DIOpolyOxideThick = value->rValue * 1e-10; /* Angstrom -> m */
             model->DIOpolyOxideThickGiven = TRUE;
             break;
         case DIO_MOD_XM:
diff --git a/src/spicelib/devices/dio/diosetup.c b/src/spicelib/devices/dio/diosetup.c
index d67449313..98ced6e01 100644
--- a/src/spicelib/devices/dio/diosetup.c
+++ b/src/spicelib/devices/dio/diosetup.c
@@ -259,10 +259,10 @@ DIOsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
             model->DIOwidthPoly = 0.0;
         }
         if(!model->DIOmetalOxideThickGiven) {
-            model->DIOmetalOxideThick = 1e-06; /* m */
+            model->DIOmetalOxideThick = 1e4; /* 10k Angstrom */
         }
         if(!model->DIOpolyOxideThickGiven) {
-            model->DIOpolyOxideThick = 1e-06; /* m */
+            model->DIOpolyOxideThick = 1e4; /* 10k Angstrom */
         }
         if(!model->DIOmetalMaskOffsetGiven) {
             model->DIOmetalMaskOffset = 0.0;