diff --git a/src/cvodes/fmod_int32/fcvodes_mod.c b/src/cvodes/fmod_int32/fcvodes_mod.c
index dfb9a1d1b5..1abbf0b213 100644
--- a/src/cvodes/fmod_int32/fcvodes_mod.c
+++ b/src/cvodes/fmod_int32/fcvodes_mod.c
@@ -1809,18 +1809,18 @@ SWIGEXPORT int _wrap_FCVodeSetSensMaxNonlinIters(void *farg1, int const *farg2)
 }
 
 
-SWIGEXPORT int _wrap_FCVodeSetSensParams(void *farg1, double *farg2, double *farg3, int *farg4) {
+SWIGEXPORT int _wrap_FCVodeSetSensParams(void *farg1, double *farg2, double *farg3, int32_t *farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
   sunrealtype *arg2 = (sunrealtype *) 0 ;
   sunrealtype *arg3 = (sunrealtype *) 0 ;
-  int *arg4 = (int *) 0 ;
+  sunindextype *arg4 = (sunindextype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (sunrealtype *)(farg2);
   arg3 = (sunrealtype *)(farg3);
-  arg4 = (int *)(farg4);
+  arg4 = (sunindextype *)(farg4);
   result = (int)CVodeSetSensParams(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
diff --git a/src/cvodes/fmod_int32/fcvodes_mod.f90 b/src/cvodes/fmod_int32/fcvodes_mod.f90
index f3cd69dcbf..b860f852bb 100644
--- a/src/cvodes/fmod_int32/fcvodes_mod.f90
+++ b/src/cvodes/fmod_int32/fcvodes_mod.f90
@@ -4526,7 +4526,7 @@ function FCVodeSetSensParams(cvode_mem, p, pbar, plist) &
 type(C_PTR) :: cvode_mem
 real(C_DOUBLE), dimension(*), target, intent(inout) :: p
 real(C_DOUBLE), dimension(*), target, intent(inout) :: pbar
-integer(C_INT), dimension(*), target, intent(inout) :: plist
+integer(C_INT32_T), dimension(*), target, intent(inout) :: plist
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 type(C_PTR) :: farg2 
diff --git a/src/cvodes/fmod_int64/fcvodes_mod.c b/src/cvodes/fmod_int64/fcvodes_mod.c
index 9f9ebf974d..bc07e459eb 100644
--- a/src/cvodes/fmod_int64/fcvodes_mod.c
+++ b/src/cvodes/fmod_int64/fcvodes_mod.c
@@ -1809,18 +1809,18 @@ SWIGEXPORT int _wrap_FCVodeSetSensMaxNonlinIters(void *farg1, int const *farg2)
 }
 
 
-SWIGEXPORT int _wrap_FCVodeSetSensParams(void *farg1, double *farg2, double *farg3, int *farg4) {
+SWIGEXPORT int _wrap_FCVodeSetSensParams(void *farg1, double *farg2, double *farg3, int64_t *farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
   sunrealtype *arg2 = (sunrealtype *) 0 ;
   sunrealtype *arg3 = (sunrealtype *) 0 ;
-  int *arg4 = (int *) 0 ;
+  sunindextype *arg4 = (sunindextype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (sunrealtype *)(farg2);
   arg3 = (sunrealtype *)(farg3);
-  arg4 = (int *)(farg4);
+  arg4 = (sunindextype *)(farg4);
   result = (int)CVodeSetSensParams(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
diff --git a/src/cvodes/fmod_int64/fcvodes_mod.f90 b/src/cvodes/fmod_int64/fcvodes_mod.f90
index 96a1464d33..8620cef7d5 100644
--- a/src/cvodes/fmod_int64/fcvodes_mod.f90
+++ b/src/cvodes/fmod_int64/fcvodes_mod.f90
@@ -4526,7 +4526,7 @@ function FCVodeSetSensParams(cvode_mem, p, pbar, plist) &
 type(C_PTR) :: cvode_mem
 real(C_DOUBLE), dimension(*), target, intent(inout) :: p
 real(C_DOUBLE), dimension(*), target, intent(inout) :: pbar
-integer(C_INT), dimension(*), target, intent(inout) :: plist
+integer(C_INT64_T), dimension(*), target, intent(inout) :: plist
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 type(C_PTR) :: farg2 
diff --git a/src/sunmatrix/sparse/fmod_int64/fsunmatrix_sparse_mod.c b/src/sunmatrix/sparse/fmod_int64/fsunmatrix_sparse_mod.c
index eee8d9d198..3f97241d5f 100644
--- a/src/sunmatrix/sparse/fmod_int64/fsunmatrix_sparse_mod.c
+++ b/src/sunmatrix/sparse/fmod_int64/fsunmatrix_sparse_mod.c
@@ -516,6 +516,29 @@ SWIGEXPORT double * _wrap_FSUNSparseMatrix_Data(SUNMatrix farg1) {
   return fresult;
 }
 
+#if SUNDIALS_INT32_T
+SWIGEXPORT int32_t * _wrap_FSUNSparseMatrix_IndexValues(SUNMatrix farg1) {
+  int32_t * fresult ;
+  SUNMatrix arg1 = (SUNMatrix) 0 ;
+  sunindextype *result = 0 ;
+
+  arg1 = (SUNMatrix)(farg1);
+  result = (sunindextype *)SUNSparseMatrix_IndexValues(arg1);
+  fresult = result;
+  return fresult;
+}
+
+SWIGEXPORT int32_t * _wrap_FSUNSparseMatrix_IndexPointers(SUNMatrix farg1) {
+  int32_t * fresult ;
+  SUNMatrix arg1 = (SUNMatrix) 0 ;
+  sunindextype *result = 0 ;
+
+  arg1 = (SUNMatrix)(farg1);
+  result = (sunindextype *)SUNSparseMatrix_IndexPointers(arg1);
+  fresult = result;
+  return fresult;
+}
+#else
 SWIGEXPORT int64_t * _wrap_FSUNSparseMatrix_IndexValues(SUNMatrix farg1) {
   int64_t * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
@@ -537,5 +560,6 @@ SWIGEXPORT int64_t * _wrap_FSUNSparseMatrix_IndexPointers(SUNMatrix farg1) {
   fresult = result;
   return fresult;
 }
+#endif