diff --git a/ADOL-C/include/adolc/drivers/drivers.h b/ADOL-C/include/adolc/drivers/drivers.h
index d89f4498..bae5691d 100644
--- a/ADOL-C/include/adolc/drivers/drivers.h
+++ b/ADOL-C/include/adolc/drivers/drivers.h
@@ -53,10 +53,10 @@ ADOLC_DLL_EXPORT fint large_jacobian_(fint *, fint *, fint *, fint *, fdouble *,
 /*--------------------------------------------------------------------------*/
 /*                                                         vector_jacobian  */
 /* vec_jac(tag, m, n, repeat, x[n], u[m], v[n])                             */
-ADOLC_DLL_EXPORT int vec_jac(short, int, int, int, const double *, double *,
-                             double *);
+ADOLC_DLL_EXPORT int vec_jac(short, int, int, int, const double *,
+                             const double *, double *);
 ADOLC_DLL_EXPORT fint vec_jac_(fint *, fint *, fint *, fint *, fdouble *,
-                               fdouble *, fdouble *);
+                               const fdouble *, fdouble *);
 
 /*--------------------------------------------------------------------------*/
 /*                                                          jacobian_vector */
diff --git a/ADOL-C/include/adolc/fortutils.h b/ADOL-C/include/adolc/fortutils.h
index 9f4822c2..d624376e 100644
--- a/ADOL-C/include/adolc/fortutils.h
+++ b/ADOL-C/include/adolc/fortutils.h
@@ -22,8 +22,8 @@
 /*                                                         Now the C THINGS */
 BEGIN_C_DECLS
 
-ADOLC_DLL_EXPORT void spread1(int m, fdouble *x, double *X);
-ADOLC_DLL_EXPORT void pack1(int m, double *X, fdouble *x);
+ADOLC_DLL_EXPORT void spread1(int m, const fdouble *x, double *X);
+ADOLC_DLL_EXPORT void pack1(int m, const double *X, fdouble *x);
 
 ADOLC_DLL_EXPORT void spread2(int m, int n, fdouble *x, double **X);
 ADOLC_DLL_EXPORT void pack2(int m, int n, double **X, fdouble *x);
diff --git a/ADOL-C/include/adolc/interfaces.h b/ADOL-C/include/adolc/interfaces.h
index d5b9fbfd..1bff065b 100644
--- a/ADOL-C/include/adolc/interfaces.h
+++ b/ADOL-C/include/adolc/interfaces.h
@@ -353,10 +353,10 @@ ADOLC_DLL_EXPORT int nonl_ind_old_forward_tight(short, int, int, const double *,
 /*                                                                      FOS */
 /* fos_reverse(tag, m, n, u[m], z[n])                                       */
 /* (defined in fo_rev.c)                                                    */
-ADOLC_DLL_EXPORT int fos_reverse(short, int, int, double *, double *);
+ADOLC_DLL_EXPORT int fos_reverse(short, int, int, const double *, double *);
 
 /* now pack the arrays into vectors for Fortran calling                     */
-ADOLC_DLL_EXPORT fint fos_reverse_(fint *, fint *, fint *, fdouble *,
+ADOLC_DLL_EXPORT fint fos_reverse_(fint *, fint *, fint *, const fdouble *,
                                    fdouble *);
 
 /*--------------------------------------------------------------------------*/
diff --git a/ADOL-C/src/drivers/drivers.c b/ADOL-C/src/drivers/drivers.c
index 0d942fc7..611826cd 100644
--- a/ADOL-C/src/drivers/drivers.c
+++ b/ADOL-C/src/drivers/drivers.c
@@ -53,7 +53,7 @@ int gradient(short tag, int n, const double *argument, double *result) {
 /*                                                                          */
 /* vec_jac(tag, m, n, repeat, x[n], u[m], v[n])                             */
 int vec_jac(short tag, int m, int n, int repeat, const double *argument,
-            double *lagrange, double *row) {
+            const double *lagrange, double *row) {
   int rc = -1;
   double *y = NULL;
 
diff --git a/ADOL-C/src/drivers/driversf.c b/ADOL-C/src/drivers/driversf.c
index 52e79cc4..03a108a1 100644
--- a/ADOL-C/src/drivers/driversf.c
+++ b/ADOL-C/src/drivers/driversf.c
@@ -64,7 +64,7 @@ fint gradient_(fint *ftag, fint *fn, fdouble *fargument, fdouble *fresult) {
 /*                                                                          */
 /* vec_jac(tag, m, n, repeat, x[n], u[m], v[n])                             */
 fint vec_jac_(fint *ftag, fint *fm, fint *fn, fint *frepeat, fdouble *fargument,
-              fdouble *flagrange, fdouble *frow) {
+              const fdouble *flagrange, fdouble *frow) {
   int rc = -1;
   short tag = (short)*ftag;
   int m = *fm, n = *fn, repeat = *frepeat;
diff --git a/ADOL-C/src/fo_rev.c b/ADOL-C/src/fo_rev.c
index de3cdd2b..f59a77f7 100644
--- a/ADOL-C/src/fo_rev.c
+++ b/ADOL-C/src/fo_rev.c
@@ -236,7 +236,8 @@ int fos_pl_sig_reverse(short tnum, /* tape id */
 int fos_reverse(short tnum, /* tape id */
                 int depen,  /* consistency chk on # of deps */
                 int indep,  /* consistency chk on # of indeps */
-                double *lagrange, double *results) /*  coefficient vectors */
+                const double *lagrange,
+                double *results) /*  coefficient vectors */
 
 #endif
 #elif _FOV_
@@ -737,10 +738,7 @@ int int_reverse_safe(
         *Ares = 0.0;
 #else
       if (ADOLC_CURRENT_TAPE_INFOS.in_nested_ctx) {
-        FOR_0_LE_l_LT_p {
-          ARES_INC = LAGRANGETRANS(l, indexd);
-          LAGRANGETRANS(l, indexd) = 0.0;
-        }
+        FOR_0_LE_l_LT_p { ARES_INC = LAGRANGETRANS(l, indexd); }
       } else {
         FOR_0_LE_l_LT_p ARES_INC = LAGRANGE(l, indexd);
       }
diff --git a/ADOL-C/src/fortutils.c b/ADOL-C/src/fortutils.c
index 1d618438..9506bfdf 100644
--- a/ADOL-C/src/fortutils.c
+++ b/ADOL-C/src/fortutils.c
@@ -21,14 +21,14 @@ BEGIN_C_DECLS
 /*                                                                          */
 
 /*--------------------------------------------------------------------------*/
-void spread1(int m, fdouble *x, double *X) {
+void spread1(int m, const fdouble *x, double *X) {
   int j;
   for (j = 0; j < m; j++)
     X[j] = *x++;
 }
 
 /*--------------------------------------------------------------------------*/
-void pack1(int m, double *X, fdouble *x) {
+void pack1(int m, const double *X, fdouble *x) {
   int j;
   for (j = 0; j < m; j++)
     *x++ = X[j];
diff --git a/ADOL-C/src/interfacesf.c b/ADOL-C/src/interfacesf.c
index fa79c8b6..4b665d48 100644
--- a/ADOL-C/src/interfacesf.c
+++ b/ADOL-C/src/interfacesf.c
@@ -129,7 +129,8 @@ fint hos_ti_reverse_(fint *ftag, fint *fm, fint *fn, fint *fd, fdouble *fu,
 }
 
 /*--------------------------------------------------------------------------*/
-fint fos_reverse_(fint *ftag, fint *fm, fint *fn, fdouble *fu, fdouble *fz) {
+fint fos_reverse_(fint *ftag, fint *fm, fint *fn, const fdouble *fu,
+                  fdouble *fz) {
   int rc = -1;
   int tag = *ftag, m = *fm, n = *fn;
   double *u = myalloc1(m);