diff --git a/runtime/hsa-runtime/pcs/pcs_runtime.cpp b/runtime/hsa-runtime/pcs/pcs_runtime.cpp
index 31a7fe94d3..b7809539ba 100644
--- a/runtime/hsa-runtime/pcs/pcs_runtime.cpp
+++ b/runtime/hsa-runtime/pcs/pcs_runtime.cpp
@@ -131,6 +131,11 @@ PcsRuntime::PcSamplingSession::PcSamplingSession(
   csd.buffer_size = buffer_size;
   csd.data_ready_callback = data_ready_callback;
   csd.client_callback_data = client_callback_data;
+
+  data_rdy.buf1 = nullptr;
+  data_rdy.buf1_sz = 0;
+  data_rdy.buf2 = nullptr;
+  data_rdy.buf2_sz = 0;
 }
 
 void PcsRuntime::PcSamplingSession::GetHsaKmtSamplingInfo(HsaPcSamplingInfo* sampleInfo) {
diff --git a/runtime/hsa-runtime/pcs/pcs_runtime.h b/runtime/hsa-runtime/pcs/pcs_runtime.h
index d78ea2959f..3547693e8d 100644
--- a/runtime/hsa-runtime/pcs/pcs_runtime.h
+++ b/runtime/hsa-runtime/pcs/pcs_runtime.h
@@ -79,11 +79,11 @@ class PcsRuntime {
                       void* client_callback_data);
     ~PcSamplingSession(){};
 
-    const bool isValid() { return valid_; }
-    const size_t buffer_size() { return csd.buffer_size; }
-    const hsa_ven_amd_pcs_method_kind_t method() { return csd.method; }
-    const size_t latency() { return csd.latency; }
-    const size_t sample_size() { return sample_size_; }
+    bool isValid() const { return valid_; }
+    size_t buffer_size() const { return csd.buffer_size; }
+    hsa_ven_amd_pcs_method_kind_t method() const { return csd.method; }
+    size_t latency() const { return csd.latency; }
+    size_t sample_size() const { return sample_size_; }
 
     void GetHsaKmtSamplingInfo(HsaPcSamplingInfo* sampleInfo);
     hsa_status_t HandleSampleData(uint8_t* buf1, size_t buf1_sz, uint8_t* buf2, size_t buf2_sz,