diff --git a/src/spicelib/devices/cpl/cplload.c b/src/spicelib/devices/cpl/cplload.c
index 729ec9097..04346273b 100644
--- a/src/spicelib/devices/cpl/cplload.c
+++ b/src/spicelib/devices/cpl/cplload.c
@@ -34,14 +34,15 @@ CPLload(GENmodel *inModel, CKTcircuit *ckt)
 	CPLmodel *model	= (CPLmodel *)inModel;
 	CPLinstance *here;
 	CPLine *cp, *cp2;
-	int *k,	*l;
+	int *k_p, *l_p;
 	int time, time2;
 	double h, h1, f;
-	int hint;
+/*	int hint; never used */
 	double hf;
 	NODE *nd;
 	double v, v1, g;
-	int cond1, i;
+	int i, j, k, l;
+	int cond1;
 	int noL, m, p, q;
 	CKTnode	*node;
 	VI_list	*vi, *vi_before;
@@ -53,7 +54,7 @@ CPLload(GENmodel *inModel, CKTcircuit *ckt)
 	h = ckt->CKTdelta;
 	h1 = 0.5 * h;
 	time2 =	(int) (ckt->CKTtime * 1e12);
-	hint = (int)(h * 1e12);
+/*	hint = (int)(h * 1e12); never used */
 	hf = h * 1e12;
 	time = (int) ((ckt->CKTtime - ckt->CKTdelta) * 1e12);
 
@@ -81,7 +82,7 @@ CPLload(GENmodel *inModel, CKTcircuit *ckt)
 
 			if (cp->vi_tail->time >	time) {
 				time = cp->vi_tail->time;
-				hint = time2 - time;
+/*				hint = time2 - time; never used */
 			}
 
 			before = cp->vi_tail->time;
@@ -186,7 +187,6 @@ CPLload(GENmodel *inModel, CKTcircuit *ckt)
 				vi = new_vi();
 				vi->time = 0;
 				{
-				int i, j, k, l;
 				for (i = 0; i <	cp->noL; i++) {
 					for (j = 0; j <	cp->noL; j++) {
 						TMS *tms;
@@ -277,12 +277,12 @@ CPLload(GENmodel *inModel, CKTcircuit *ckt)
 				}
 			}
 
-			k = here->CPLibr1;
-			l = here->CPLibr2;
+			k_p = here->CPLibr1;
+			l_p = here->CPLibr2;
 
 			copy_cp(cp2, cp);
 
-			if (right_consts(here,cp2, time,time2,h,h1,k,l,ckt)) {
+			if (right_consts(here,cp2, time,time2,h,h1,k_p,l_p,ckt)) {
 				cp2->ext = 1;
 				for (q = 0; q <	noL; q++) {
 					cp->ratio[q] = ratio[q];
@@ -772,9 +772,10 @@ get_pvs_vi(int t1, int t2,
    return(ext);
 
 errordetect:
-	fprintf(stderr,	"your maximum time step	is too large for tau.\n");
-	fprintf(stderr,	"decrease max time step	in .tran card and try again\n");
-	controlled_exit(0);
+   fprintf(stderr,	"your maximum time step	is too large for tau.\n");
+   fprintf(stderr,	"decrease max time step	in .tran card and try again\n");
+   controlled_exit(0);
+   return(0);
 }
 
 
diff --git a/src/spicelib/devices/cpl/cplsetup.c b/src/spicelib/devices/cpl/cplsetup.c
index f6c5e49fa..1c876af0e 100644
--- a/src/spicelib/devices/cpl/cplsetup.c
+++ b/src/spicelib/devices/cpl/cplsetup.c
@@ -110,7 +110,7 @@ static int Pade_apx(double, double*, double*, double*, double*, double*, double*
 static int Gaussian_Elimination(int);
 static double root3(double, double, double, double);
 static int div3(double, double, double, double, double*, double*);
-static int find_roots(double, double, double, double*, double*,double*);
+static int find_roots(double, double, double, double*, double*, double*);
 
 static NODE* insert_node(char*);
 static NDnamePt insert_ND(char*, NDnamePt*);
@@ -1111,16 +1111,14 @@ poly_W(int dim, int deg)
 static void
 eval_frequency(int dim, int deg_o)
 {
-   int i, im;
+   int i;
    double min;
 
    min = D[0];
-   im = 0;
 
    for (i = 1; i < dim; i++) 
       if (D[i] < min) {
          min = D[i];
-         im = i;
       }
 
    if (min <= 0) {
@@ -1794,8 +1792,8 @@ find_roots(double a1, double a2, double a3, double *x1, double *x2, double *x3)
    fprintf(stderr, "..1.. %e\n", x*x*x+a1*x*x+a2*x+a3);
     */
    { 
-      double x1;
-      int i = 0;
+   double x1;
+   int i = 0;
    x1 = x;
    for (t = root3(a1, a2, a3, x); ABS(t-x) > 5.0e-4; 
                             t = root3(a1, a2, a3, x))