diff --git a/third_party/gpus/rocm/BUILD.tpl b/third_party/gpus/rocm/BUILD.tpl
index 51ab379ed21e4..f225ec82baae3 100644
--- a/third_party/gpus/rocm/BUILD.tpl
+++ b/third_party/gpus/rocm/BUILD.tpl
@@ -148,6 +148,7 @@ rocm_lib_import(
     data = glob(
         [
             "%{rocm_root}/lib/libamdhip64.so*",
+            "%{rocm_root}/lib/librocm_kpack.so*",
         ],
     ),
     interface_library = "%{rocm_root}/lib/libamdhip64.so",
@@ -195,6 +196,7 @@ cc_library(
             "%{rocm_root}/lib/libamd_comgr_loader.so*",
             "%{rocm_root}/lib/libamd_comgr.so*",
             "%{rocm_root}/lib/llvm/lib/libLLVM.so*",
+            "%{rocm_root}/lib/llvm/lib/libclang-cpp.so*",
         ],
     ),
     deps = [
diff --git a/xla/stream_executor/rocm/rocm_blas.cc b/xla/stream_executor/rocm/rocm_blas.cc
index 0fabd1dc387fc..297327c97e465 100644
--- a/xla/stream_executor/rocm/rocm_blas.cc
+++ b/xla/stream_executor/rocm/rocm_blas.cc
@@ -69,7 +69,7 @@ namespace {
 
 #define ROCBLAS_API_WRAPPER(__name)               \
   struct WrapperShim__##__name {                  \
-    constexpr static const char* kName = #__name; \
+    constexpr static const char *kName = #__name; \
     template <typename... Args>                   \
     rocblas_status operator()(Args... args) {     \
       return (::__name)(args...);                 \
diff --git a/xla/tsl/platform/default/dso_loader.cc b/xla/tsl/platform/default/dso_loader.cc
index e79365fd562c6..6fa691439f999 100644
--- a/xla/tsl/platform/default/dso_loader.cc
+++ b/xla/tsl/platform/default/dso_loader.cc
@@ -50,7 +50,6 @@ absl::string_view GetCusparseVersion() { return TF_CUSPARSE_VERSION; }
 absl::string_view GetNcclVersion() { return TF_NCCL_VERSION; }
 absl::string_view GetTensorRTVersion() { return TF_TENSORRT_VERSION; }
 absl::string_view GetNvshmemVersion() { return XLA_NVSHMEM_VERSION; }
-
 absl::StatusOr<void*> GetDsoHandle(const std::string& name,
                                    absl::string_view version) {
   auto filename =