diff --git a/src/include/ngspice/cmproto.h b/src/include/ngspice/cmproto.h
index 4b37c8924..cee92fcae 100644
--- a/src/include/ngspice/cmproto.h
+++ b/src/include/ngspice/cmproto.h
@@ -116,13 +116,6 @@ void  free_pj(const void *ptr);
 
 FILE *fopen_with_path(const char *path, const char *mode);
 
-#ifdef __GNUC__
-int cm_message_printf(const char *fmt, ...)
-        __attribute__ ((format (__printf__, 1, 2)));
-#else
-int cm_message_printf(const char *fmt, ...);
-#endif
-
 #define CM_IGNORE(x) (void) (x)
 
 #endif /* include guard */
diff --git a/src/spicelib/devices/bsimsoi/b4soild.c b/src/spicelib/devices/bsimsoi/b4soild.c
index fb259cc16..64a5d1ebd 100644
--- a/src/spicelib/devices/bsimsoi/b4soild.c
+++ b/src/spicelib/devices/bsimsoi/b4soild.c
@@ -9393,7 +9393,9 @@ finished: /* returning Values to Calling Routine */
             if (!ChargeComputationNeeded)
                 goto line850;
 
+#ifndef NOBYPASS
 line755:
+#endif
             ag0 = ckt->CKTag[0];
 
             T0 = vgd + DELTA_1;
diff --git a/src/spicelib/devices/hisim2/hsm2ld.c b/src/spicelib/devices/hisim2/hsm2ld.c
index e7869f02e..cf694177a 100644
--- a/src/spicelib/devices/hisim2/hsm2ld.c
+++ b/src/spicelib/devices/hisim2/hsm2ld.c
@@ -884,7 +884,9 @@ tm0 = gtodsecld() ;
     
     if (!ChargeComputationNeeded) goto line850; 
     
- line755:
+#ifndef NOBYPASS
+line755:
+#endif
 
     ag0 = ckt->CKTag[0];
     if (here->HSM2_mode > 0) { /* NORMAL mode */
diff --git a/src/spicelib/devices/hisimhv1/hsmhvld.c b/src/spicelib/devices/hisimhv1/hsmhvld.c
index 517c4f0b7..38aa17a05 100644
--- a/src/spicelib/devices/hisimhv1/hsmhvld.c
+++ b/src/spicelib/devices/hisimhv1/hsmhvld.c
@@ -1042,8 +1042,9 @@ int HSMHVload(
 
       here->HSMHV_called += 1;
 
+#ifndef NOBYPASS
 line755: /* standard entry if HSMHVevaluate is bypassed */
-         /* (could be shifted a bit forward ...)       */
+#endif   /* (could be shifted a bit forward ...)       */
       if ( here->HSMHV_mode > 0 ) { /* forward mode */
         Rd         = here->HSMHV_Rd ;
         dRd_dVdse  = here->HSMHV_dRd_dVdse  ;
diff --git a/src/spicelib/devices/vdmos/vdmosdefs.h b/src/spicelib/devices/vdmos/vdmosdefs.h
index 13166c7af..824ab429d 100644
--- a/src/spicelib/devices/vdmos/vdmosdefs.h
+++ b/src/spicelib/devices/vdmos/vdmosdefs.h
@@ -16,6 +16,8 @@ VDMOS: 2018 Holger Vogt, 2020 Dietmar Warning
 
 /* declarations for VDMOSFETs */
 
+void VDMOStempUpdate(VDMOSmodel *, VDMOSinstance *, double , CKTcircuit *);
+
 /* indices to the array of MOSFET(1) noise sources */
 
 enum {
diff --git a/src/spicelib/devices/vdmos/vdmosload.c b/src/spicelib/devices/vdmos/vdmosload.c
index 48a30478e..2f324129e 100644
--- a/src/spicelib/devices/vdmos/vdmosload.c
+++ b/src/spicelib/devices/vdmos/vdmosload.c
@@ -304,7 +304,6 @@ VDMOSload(GENmodel *inModel, CKTcircuit *ckt)
                 drd1T_dT = 0.0;
                 if (model->VDMOSqsGiven)
                     rd1T = here->VDMOSqsResistance;
-                    drd1T_dT = 0.0;
             }
 
             /*
@@ -885,7 +884,9 @@ bypass:
             *(ckt->CKTstate0 + here->VDIOconduct) = gd;
             *(ckt->CKTstate0 + here->VDIOdIdio_dT) = dIdio_dT;
 
+#ifndef NOBYPASS
 load:
+#endif
             if (selfheat) {
                 Ith = vd*cd;
                 dIth_dVdio = cd + vd*gd;
diff --git a/src/spicelib/parser/inpgmod.c b/src/spicelib/parser/inpgmod.c
index 52aaf97d0..292f7f7ca 100644
--- a/src/spicelib/parser/inpgmod.c
+++ b/src/spicelib/parser/inpgmod.c
@@ -235,11 +235,12 @@ INPgetModBin(CKTcircuit *ckt, char *name, INPmodel **model, INPtables *tab, char
     if (!cp_getvar("scale", CP_REAL, &scale, 0))
         scale = 1;
 
-    if (!cp_getvar("wnflag", CP_NUM, &wnflag, 0))
+    if (!cp_getvar("wnflag", CP_NUM, &wnflag, 0)) {
         if (newcompat.spe || newcompat.hs)
             wnflag = 1;
         else
             wnflag = 0;
+    }
 
     *model = NULL;