diff --git a/SRC/TRF3dV100/schurCompUpdate_impl.cuh b/SRC/TRF3dV100/schurCompUpdate_impl.cuh
index 3107e181..dea74d7d 100644
--- a/SRC/TRF3dV100/schurCompUpdate_impl.cuh
+++ b/SRC/TRF3dV100/schurCompUpdate_impl.cuh
@@ -85,7 +85,7 @@ __device__ int_t xlpanelGPU_t<Ftype>::find(int_t k)
 {
     int threadId = threadIdx.x;
     __shared__ int idx;
-    // __shared__ int found;
+    __shared__ int found;
     if (!threadId)
     {
         idx = -1;
@@ -119,7 +119,7 @@ __device__ int_t xupanelGPU_t<Ftype>::find(int_t k)
 {
     int threadId = threadIdx.x;
     __shared__ int idx;
-    // __shared__ int found;
+    __shared__ int found;
     if (!threadId)
     {
         idx = -1;
diff --git a/SRC/include/superlu_defs.h b/SRC/include/superlu_defs.h
index 6f9998ef..79ec3e0d 100755
--- a/SRC/include/superlu_defs.h
+++ b/SRC/include/superlu_defs.h
@@ -1115,8 +1115,8 @@ extern void    countnz_dist (const int_t, int_t *, int_t *, int_t *,
 extern int64_t fixupL_dist (const int_t, const int_t *, Glu_persist_t *,
 				  Glu_freeable_t *);
 extern int_t   *TreePostorder_dist (int_t, int_t *);
-extern float   smach_dist(char *);
-extern double  dmach_dist(char *);
+extern float   smach_dist(const char *);
+extern double  dmach_dist(const char *);
 extern void    *superlu_malloc_dist (size_t);
 extern void    superlu_free_dist (void*);
 extern int   *int32Malloc_dist (int);
diff --git a/SRC/prec-independent/dmach_dist.c b/SRC/prec-independent/dmach_dist.c
index a4814855..332fee47 100755
--- a/SRC/prec-independent/dmach_dist.c
+++ b/SRC/prec-independent/dmach_dist.c
@@ -13,7 +13,7 @@ at the top-level directory.
 #include <stdio.h>
 #include <string.h>
 
-double dmach_dist(char *cmach)
+double dmach_dist(const char *cmach)
 {
 /*  -- SuperLU auxiliary routine (version 5.0) --   
     This uses C99 standard constants, and is thread safe.
diff --git a/SRC/prec-independent/smach_dist.c b/SRC/prec-independent/smach_dist.c
index 394347e0..e480af4e 100755
--- a/SRC/prec-independent/smach_dist.c
+++ b/SRC/prec-independent/smach_dist.c
@@ -13,7 +13,7 @@ at the top-level directory.
 #include <stdio.h>
 #include <string.h>
 
-float smach_dist(char *cmach)
+float smach_dist(const char *cmach)
 {
 /*  -- SuperLU auxiliary routine (version 5.0) --   
     This uses C99 standard constants, and is thread safe.