diff --git a/src/spicelib/devices/bjt/bjtnoise.c b/src/spicelib/devices/bjt/bjtnoise.c
index 08888383c..962d0231e 100644
--- a/src/spicelib/devices/bjt/bjtnoise.c
+++ b/src/spicelib/devices/bjt/bjtnoise.c
@@ -85,7 +85,7 @@ BJTnoise(int mode, int operation, GENmodel*genmodel, CKTcircuit *ckt,
                 case N_DENS:
 
                     if (inst->BJTtempGiven)
-                        dtemp = inst->BJTtemp - ckt->CKTtemp + (model->BJTtnom-CONSTCtoK);
+                        dtemp = inst->BJTtemp - ckt->CKTtemp;
                     else
                         dtemp = inst->BJTdtemp;
 
diff --git a/src/spicelib/devices/dio/dionoise.c b/src/spicelib/devices/dio/dionoise.c
index de2ba3793..b83b5d096 100644
--- a/src/spicelib/devices/dio/dionoise.c
+++ b/src/spicelib/devices/dio/dionoise.c
@@ -86,7 +86,7 @@ DIOnoise(int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,
                 case N_DENS:
 
                     if (inst->DIOtempGiven)
-                        dtemp = inst->DIOtemp - ckt->CKTtemp + (model->DIOnomTemp-CONSTCtoK);
+                        dtemp = inst->DIOtemp - ckt->CKTtemp;
                     else
                         dtemp = inst->DIOdtemp;
 
@@ -135,6 +135,14 @@ DIOnoise(int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt,
                         noizDens[DIOTOTNOIZ] += noizDens[DIORSSWNOIZ] +
                             noizDens[DIOIDSWNOIZ] +
                             noizDens[DIOFLSWNOIZ];
+                    } else {
+                        /* no sidewall model */
+                        noizDens[DIORSSWNOIZ] = 0.0;
+                        noizDens[DIOIDSWNOIZ] = 0.0;
+                        noizDens[DIOFLSWNOIZ] = 0.0;
+                        lnNdens[DIORSSWNOIZ] = log(N_MINLOG);
+                        lnNdens[DIOIDSWNOIZ] = log(N_MINLOG);
+                        lnNdens[DIOFLSWNOIZ] = log(N_MINLOG);
                     }
 
                     lnNdens[DIOTOTNOIZ] =
diff --git a/src/spicelib/devices/hicum2/hicum2noise.c b/src/spicelib/devices/hicum2/hicum2noise.c
index bfc93bf2c..406a76410 100644
--- a/src/spicelib/devices/hicum2/hicum2noise.c
+++ b/src/spicelib/devices/hicum2/hicum2noise.c
@@ -128,7 +128,7 @@ HICUMnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata
                 case N_DENS:
 
                     if (here->HICUMtempGiven)
-                        dtemp = here->HICUMtemp - ckt->CKTtemp + (model->HICUMtnom-CONSTCtoK);
+                        dtemp = here->HICUMtemp - ckt->CKTtemp;
                     else
                         dtemp = here->HICUMdtemp;
 
diff --git a/src/spicelib/devices/jfet/jfetnoi.c b/src/spicelib/devices/jfet/jfetnoi.c
index 3b43275e2..6935d5a2f 100644
--- a/src/spicelib/devices/jfet/jfetnoi.c
+++ b/src/spicelib/devices/jfet/jfetnoi.c
@@ -83,7 +83,7 @@ JFETnoise(int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *d
                 case N_DENS:
 
                     if (inst->JFETtempGiven)
-                        dtemp = inst->JFETtemp - ckt->CKTtemp + (model->JFETtnom-CONSTCtoK);
+                        dtemp = inst->JFETtemp - ckt->CKTtemp;
                     else
                         dtemp = inst->JFETdtemp;
 
diff --git a/src/spicelib/devices/mos1/mos1noi.c b/src/spicelib/devices/mos1/mos1noi.c
index 7b3f9f696..f39e2bb04 100644
--- a/src/spicelib/devices/mos1/mos1noi.c
+++ b/src/spicelib/devices/mos1/mos1noi.c
@@ -98,7 +98,7 @@ MOS1noise(int mode, int operation, GENmodel * genmodel, CKTcircuit * ckt,
                 case N_DENS:
 
                     if (inst->MOS1tempGiven)
-                        dtemp = inst->MOS1temp - ckt->CKTtemp + (model->MOS1tnom-CONSTCtoK);
+                        dtemp = inst->MOS1temp - ckt->CKTtemp;
                     else
                         dtemp = inst->MOS1dtemp;
 
diff --git a/src/spicelib/devices/mos2/mos2noi.c b/src/spicelib/devices/mos2/mos2noi.c
index fdbecb7f6..ba35474c4 100644
--- a/src/spicelib/devices/mos2/mos2noi.c
+++ b/src/spicelib/devices/mos2/mos2noi.c
@@ -87,7 +87,7 @@ MOS2noise(int mode, int operation, GENmodel * genmodel, CKTcircuit * ckt,
                 case N_DENS:
 
                     if (inst->MOS2tempGiven)
-                        dtemp = inst->MOS2temp - ckt->CKTtemp + (model->MOS2tnom-CONSTCtoK);
+                        dtemp = inst->MOS2temp - ckt->CKTtemp;
                     else
                         dtemp = inst->MOS2dtemp;
 
diff --git a/src/spicelib/devices/mos3/mos3noi.c b/src/spicelib/devices/mos3/mos3noi.c
index 65afec9e7..93f8a7fe1 100644
--- a/src/spicelib/devices/mos3/mos3noi.c
+++ b/src/spicelib/devices/mos3/mos3noi.c
@@ -87,7 +87,7 @@ MOS3noise(int mode, int operation, GENmodel * genmodel, CKTcircuit * ckt,
                 case N_DENS:
 
                     if (inst->MOS3tempGiven)
-                        dtemp = inst->MOS3temp - ckt->CKTtemp + (model->MOS3tnom-CONSTCtoK);
+                        dtemp = inst->MOS3temp - ckt->CKTtemp;
                     else
                         dtemp = inst->MOS3dtemp;
 
diff --git a/src/spicelib/devices/res/resnoise.c b/src/spicelib/devices/res/resnoise.c
index 044b0b796..17eea56ec 100644
--- a/src/spicelib/devices/res/resnoise.c
+++ b/src/spicelib/devices/res/resnoise.c
@@ -90,7 +90,7 @@ RESnoise(int mode, int operation, GENmodel*genmodel, CKTcircuit *ckt,
                 case N_DENS:
 
                     if (inst->REStempGiven)
-                        dtemp = inst->REStemp - ckt->CKTtemp + (model->REStnom-CONSTCtoK);
+                        dtemp = inst->REStemp - ckt->CKTtemp;
                     else
                         dtemp = inst->RESdtemp;
 
diff --git a/src/spicelib/devices/vbic/vbicnoise.c b/src/spicelib/devices/vbic/vbicnoise.c
index 3a61ff142..7c7e56b20 100644
--- a/src/spicelib/devices/vbic/vbicnoise.c
+++ b/src/spicelib/devices/vbic/vbicnoise.c
@@ -95,7 +95,7 @@ VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *
                 case N_DENS:
 
                     if (inst->VBICtempGiven)
-                        dtemp = inst->VBICtemp - ckt->CKTtemp + (model->VBICtnom-CONSTCtoK);
+                        dtemp = inst->VBICtemp - ckt->CKTtemp;
                     else
                         dtemp = inst->VBICdtemp;