diff --git a/common/UtilityMacros.h b/common/UtilityMacros.h
index bfac172f..a4849097 100644
--- a/common/UtilityMacros.h
+++ b/common/UtilityMacros.h
@@ -165,8 +165,7 @@
         _Pragma( "GCC diagnostic ignored \"-Wunused-local-typedefs\"" )     \
         _Pragma( "GCC diagnostic ignored \"-Woverloaded-virtual\"" )        \
         _Pragma( "GCC diagnostic ignored \"-Wunused-parameter\"" )          \
-        _Pragma( "GCC diagnostic ignored \"-Warray-bounds\"" )              \
-        _Pragma( "GCC diagnostic ignored \"-Wterminate\"" )
+        _Pragma( "GCC diagnostic ignored \"-Warray-bounds\"" )
     #define ENABLE_WARNINGS _Pragma( "GCC diagnostic pop" )
 #else
     #define DISABLE_WARNINGS
diff --git a/hip/GreyscaleColor.cu b/hip/GreyscaleColor.cu
index 3f77e6a7..0607bc0a 100644
--- a/hip/GreyscaleColor.cu
+++ b/hip/GreyscaleColor.cu
@@ -1610,7 +1610,9 @@ __global__ void dvc_ScaLBL_D3Q19_AAodd_GreyscaleColor_CP(int *neighborList, int
             Fcpy = ny;
             Fcpz = nz;
             double Fcp_mag=sqrt(Fcpx*Fcpx+Fcpy*Fcpy+Fcpz*Fcpz);
-            if (Fcp_mag==0.0); Fcpx=Fcpy=Fcpz=0.0;
+            if (Fcp_mag==0.0) {
+                 Fcpx=Fcpy=Fcpz=0.0;
+            }
             //NOTE for open node (porosity=1.0),Fcp=0.0
             Fcpx *= alpha*W*(1.0-porosity)/sqrt(perm); 
             Fcpy *= alpha*W*(1.0-porosity)/sqrt(perm); 
@@ -2397,7 +2399,9 @@ __global__  void dvc_ScaLBL_D3Q19_AAeven_GreyscaleColor_CP(int *Map, double *dis
             Fcpy = ny; 
             Fcpz = nz; 
             double Fcp_mag=sqrt(Fcpx*Fcpx+Fcpy*Fcpy+Fcpz*Fcpz);
-            if (Fcp_mag==0.0); Fcpx=Fcpy=Fcpz=0.0;
+            if (Fcp_mag==0.0) {
+                Fcpx=Fcpy=Fcpz=0.0;
+            }
             //NOTE for open node (porosity=1.0),Fcp=0.0
             Fcpx *= alpha*W*(1.0-porosity)/sqrt(perm); 
             Fcpy *= alpha*W*(1.0-porosity)/sqrt(perm); 
diff --git a/hip/MixedGradient.cu b/hip/MixedGradient.cu
index 31518ee5..3c8f705e 100644
--- a/hip/MixedGradient.cu
+++ b/hip/MixedGradient.cu
@@ -65,13 +65,11 @@ __global__ void dvc_ScaLBL_D3Q19_MixedGradient(int *Map, double *Phi, double *Gr
 
 extern "C" void ScaLBL_D3Q19_MixedGradient(int *Map, double *Phi, double *Gradient, int start, int finish, int Np, int Nx, int Ny, int Nz)
 {
-	hipProfilerStart();
 	dvc_ScaLBL_D3Q19_MixedGradient<<<NBLOCKS,NTHREADS >>>(Map, Phi, Gradient, start, finish, Np, Nx, Ny, Nz);
 
 	hipError_t err = hipGetLastError();
 	if (hipSuccess != err){
 		printf("hip error in ScaLBL_D3Q19_MixedGradient: %s \n",hipGetErrorString(err));
 	}
-	hipProfilerStop();
 }
 
diff --git a/tests/test_MPI.cpp b/tests/test_MPI.cpp
index 5253b81a..c6d12011 100644
--- a/tests/test_MPI.cpp
+++ b/tests/test_MPI.cpp
@@ -1257,6 +1257,7 @@ void test_GPU_aware( UnitTest *ut )
     try {
         // Initialize the device
         int device = ScaLBL_SetDevice(rank); 
+        NULL_USE( device );
         // create wrapper for communications
         gpuWrapper gpuComm(comm, N); 
         // Allocate and initialize the buffers