diff --git a/projects/clr/hipamd/include/hip/amd_detail/amd_hip_cooperative_groups.h b/projects/clr/hipamd/include/hip/amd_detail/amd_hip_cooperative_groups.h
index 0c3d9fdf9f..589c8c950f 100644
--- a/projects/clr/hipamd/include/hip/amd_detail/amd_hip_cooperative_groups.h
+++ b/projects/clr/hipamd/include/hip/amd_detail/amd_hip_cooperative_groups.h
@@ -236,7 +236,7 @@ class thread_block : public thread_group {
     const bool pow2 = ((tile_size & (tile_size - 1)) == 0);
     // Invalid tile size, assert
     if (!tile_size || (tile_size > __AMDGCN_WAVEFRONT_SIZE) || !pow2) {
-      __hip_assert(false && "invalid tile size");
+      __hip_assert(false && "invalid tile size")
     }
 
     thread_group tiledGroup = thread_group(internal::cg_tiled_group, tile_size);
@@ -291,7 +291,7 @@ class tiled_group : public thread_group {
     const bool pow2 = ((tile_size & (tile_size - 1)) == 0);
 
     if (!tile_size || (tile_size > __AMDGCN_WAVEFRONT_SIZE) || !pow2) {
-      __hip_assert(false && "invalid tile size");
+      __hip_assert(false && "invalid tile size")
     }
 
     if (size() <= tile_size) {
@@ -515,7 +515,7 @@ __CG_QUALIFIER__ uint32_t thread_group::thread_rank() const {
       return (static_cast<const coalesced_group*>(this)->thread_rank());
     }
     default: {
-      __hip_assert(false && "invalid cooperative group type");
+      __hip_assert(false && "invalid cooperative group type")
       return -1;
     }
   }
@@ -543,7 +543,7 @@ __CG_QUALIFIER__ bool thread_group::is_valid() const {
       return (static_cast<const coalesced_group*>(this)->is_valid());
     }
     default: {
-      __hip_assert(false && "invalid cooperative group type");
+      __hip_assert(false && "invalid cooperative group type")
       return false;
     }
   }
@@ -576,7 +576,7 @@ __CG_QUALIFIER__ void thread_group::sync() const {
       break;
     }
     default: {
-      __hip_assert(false && "invalid cooperative group type");
+      __hip_assert(false && "invalid cooperative group type")
     }
   }
 }
diff --git a/projects/clr/hipamd/include/hip/amd_detail/amd_warp_functions.h b/projects/clr/hipamd/include/hip/amd_detail/amd_warp_functions.h
index 1e9eba8920..c43b81f969 100644
--- a/projects/clr/hipamd/include/hip/amd_detail/amd_warp_functions.h
+++ b/projects/clr/hipamd/include/hip/amd_detail/amd_warp_functions.h
@@ -31,6 +31,7 @@ THE SOFTWARE.
 #pragma clang diagnostic ignored "-Wold-style-cast"
 #pragma clang diagnostic ignored "-Wc++98-compat"
 #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"
 #endif
 
 __device__ static inline unsigned __hip_ds_bpermute(int index, unsigned src) {