diff --git a/src/spicelib/devices/bsim4/b4ld.c b/src/spicelib/devices/bsim4/b4ld.c
index 2791f4abb..e4b664179 100644
--- a/src/spicelib/devices/bsim4/b4ld.c
+++ b/src/spicelib/devices/bsim4/b4ld.c
@@ -1,4 +1,7 @@
-/**** BSIM4.4.0  Released by Xuemei (Jane) Xi 03/04/2004 ****/
+/****
+ BSIM4.4.0  Released by Xuemei (Jane) Xi 03/04/2004
+ $Id$
+****/
 
 /**********
  * Copyright 2004 Regents of the University of California. All rights reserved.
@@ -64,7 +67,9 @@ double dRs_dvg, dRd_dvg, dRs_dvb, dRd_dvb;
 double dT0_dvg, dT1_dvb, dT3_dvg, dT3_dvb;
 double vses, vdes, vdedo, delvses, delvded, delvdes;
 double Isestot=0.0, cseshat=0.0, Idedtot=0.0, cdedhat=0.0;
-double tol0, tol1, tol2, tol3, tol4, tol5, tol6;
+//#ifndef NEWCONV
+//double tol0, tol1, tol2, tol3, tol4, tol5, tol6;
+//#endif
 
 double geltd, gcrg, gcrgg, gcrgd, gcrgs, gcrgb, ceqgcrg;
 double vges, vgms, vgedo, vgmdo, vged, vgmd, delvged, delvgmd;
diff --git a/src/spicelib/devices/nbjt/nbjtload.c b/src/spicelib/devices/nbjt/nbjtload.c
index 39cc9257f..8ace9af58 100644
--- a/src/spicelib/devices/nbjt/nbjtload.c
+++ b/src/spicelib/devices/nbjt/nbjtload.c
@@ -1,6 +1,7 @@
 /**********
 Copyright 1992 Regents of the University of California.  All rights reserved.
 Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
+$Id$
 **********/
 
 /*
@@ -41,7 +42,7 @@ NBJTload(inModel, ckt)
   double iceq, ieeq;
   double ichat = 0.0, iehat = 0.0;
   double delVce, delVbe;
-  double vce, vbe, vbc;
+  double vce, vbe /*, vbc*/;
   double dIeDVce, dIeDVbe;
   double dIcDVce, dIcDVbe;
   double xfact;
diff --git a/src/spicelib/devices/nbjt2/nbt2set.c b/src/spicelib/devices/nbjt2/nbt2set.c
index 3673ae28a..985684d88 100644
--- a/src/spicelib/devices/nbjt2/nbt2set.c
+++ b/src/spicelib/devices/nbjt2/nbt2set.c
@@ -1,6 +1,7 @@
 /**********
 Copyright 1991 Regents of the University of California.  All rights reserved.
 Author:	1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
+$Id$
 **********/
 
 #include "ngspice.h"
@@ -42,7 +43,7 @@ NBJT2setup(matrix, inModel, ckt, states)
   OUTPcard *outputs;
   char *icFileName = NULL;
   int nameLen;
-  int error, xIndex, yIndex;
+  int error, xIndex;
   int xMeshSize, yMeshSize;
   TWOdevice *pDevice;
   TWOcoord *xCoordList = NIL(TWOcoord);