diff --git a/src/spicelib/devices/hicum2/hicumL2.cpp b/src/spicelib/devices/hicum2/hicumL2.cpp
index d7acc9fb2..58e8a0264 100644
--- a/src/spicelib/devices/hicum2/hicumL2.cpp
+++ b/src/spicelib/devices/hicum2/hicumL2.cpp
@@ -99,8 +99,8 @@ duals::duald DIOY, le, vt;
 //  C		: depletion capacitance
 void QJMODF(duals::duald T, duals::duald c_0, duals::duald u_d, double z, duals::duald a_j, duals::duald U_cap, duals::duald * C, duals::duald * Qz)
 {
-    duals::duald DFV_f, DFv_e, DFs_q, DFs_q2, DFv_j, DFdvj_dv, DFQ_j, DFQ_j1, DFC_j1, DFb, vt;
-    vt = CONSTboltz * T / CHARGE;
+    duals::duald DFV_f, DFv_e, DFs_q, DFs_q2, DFv_j, DFdvj_dv, DFQ_j, DFC_j1, DFb, vt;
+    vt = CONSTboltz * T / CHARGE; 
     if (c_0 > 0.0) {
         DFV_f	 = u_d*(1.0-exp(-log(a_j)/z));
         DFv_e	 = (DFV_f-U_cap)/vt;
@@ -137,7 +137,7 @@ void QJMODF(duals::duald T, duals::duald c_0, duals::duald u_d, double z, duals:
 //  C		: depletion capacitance
 void QJMOD(duals::duald T, duals::duald c_0, duals::duald u_d, double z, double a_j, duals::duald v_pt, duals::duald U_cap, duals::duald * C, duals::duald * Qz)
 {
-    duals::duald dummy, DQ_j1, DQ_j2, DQ_j3, DC_j1, DC_j2, DC_j3, De_1, De_2, Dzr1, DCln1, DCln2, Dz1, Dv_j1, Dv_j2, Dv_j3, De, Da, Dv_r, Dv_j4, Dv_e, DC_c, DC_max, DV_f, Dv_p, Dz_r, vt;
+    duals::duald DQ_j1, DQ_j2, DQ_j3, DC_j1, DC_j2, DC_j3, De_1, De_2, Dzr1, DCln1, DCln2, Dz1, Dv_j1, Dv_j2, De, Da, Dv_r, Dv_j4, Dv_e, DC_c, DC_max, DV_f, Dv_p, Dz_r, vt;
     vt = CONSTboltz * T / CHARGE;
     if (c_0 > 0.0){
         Dz_r	= z/4.0;
@@ -376,7 +376,7 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
     double it_Vbiei, it_Vbici, it_dT;
     double Qf_Vbiei, Qf_Vbici, Qf_dT;
     double Qr_Vbiei, Qr_Vbici, Qr_dT;
-    duals::duald result_itf, result_itr, result_Qp, result_Qf, result_Qr, result_Q_bf, result_a_h, result_Q_p, result_Tf; //intermediate variables when calling void dual functions
+    duals::duald result_itf, result_itr, result_Qf, result_Qr, result_Q_bf, result_a_h, result_Q_p, result_Tf; //intermediate variables when calling void dual functions
     double T_f0, Q_p, a_h;
     double Q_bf, Q_bf_Vbiei, Q_bf_Vbici, Q_bf_dT;
     double Q_pT, Q_pT_dVbiei, Q_pT_dVbici, Q_pT_dT;
@@ -534,7 +534,7 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
     std::function<void (duals::duald, duals::duald, duals::duald, duals::duald, duals::duald*, duals::duald*, duals::duald*, duals::duald*)> HICQFC = [&](duals::duald T, duals::duald Ix, duals::duald I_CK, duals::duald FFT_pcS, duals::duald * Q_fC, duals::duald * Q_CT, duals::duald * T_fC, duals::duald * T_cT)
     {
         duals::duald FCln, FCa, FCa1, FCd_a, FCw, FCdw_daick, FCda1_dw, FCf_ci, FCdfCT_ditf, FCw2, FCz, FCdfc_dw, FFdVc_ditf, FCf_CT, FCf1, FCf2, FCrt;
-        duals::duald FCa_cl, FCa_ck, FCdaick_ditf, FCxl, FCxb, FCdf1_dw, FCz_1, FCf3, FCdf2_dw, FCdf3_dw, FCdw_ditf, FCdfc_ditf;
+        duals::duald FCa_ck, FCdaick_ditf, FCxl, FCxb, FCdf1_dw, FCz_1, FCf3, FCdf2_dw, FCdf3_dw, FCdw_ditf, FCdfc_ditf;
         duals::duald FCdfCT_dw, FCd_f, FFdVc;
 
         duals::duald vt;
diff --git a/src/spicelib/devices/hicum2/hicumL2temp.cpp b/src/spicelib/devices/hicum2/hicumL2temp.cpp
index 205f87ae5..e76acfd4d 100644
--- a/src/spicelib/devices/hicum2/hicumL2temp.cpp
+++ b/src/spicelib/devices/hicum2/hicumL2temp.cpp
@@ -97,9 +97,9 @@ void hicum_TMPHICJ(duals::duald vt, double vt0, duals::duald qtt0, duals::duald
                    double *c_j_t, double *vd_t, double *w_t,
                    double *c_j_t_dT, double *vd_t_dT, double *w_t_dT)
 {
-    duals::duald c_j_t_result = 0;
-    duals::duald vd_t_result = 0;
-    duals::duald w_t_result = 0;
+    duals::duald c_j_t_result;
+    duals::duald vd_t_result;
+    duals::duald w_t_result;
     TMPHICJ(vt, vt0, qtt0, ln_qtt0, mg, c_j, vd0, z, w, is_al, vgeff, &c_j_t_result, &vd_t_result, &w_t_result);
     *c_j_t    = c_j_t_result.rpart();
     *c_j_t_dT = c_j_t_result.dpart();