diff --git a/rocclr/runtime/device/gpu/gpukernel.cpp b/rocclr/runtime/device/gpu/gpukernel.cpp
index b97fd9dcca..4549d10494 100644
--- a/rocclr/runtime/device/gpu/gpukernel.cpp
+++ b/rocclr/runtime/device/gpu/gpukernel.cpp
@@ -4084,7 +4084,7 @@ HSAILKernel::loadArguments(
 
     hsaDisp->kernarg_address = reinterpret_cast<void*>(argList);
     hsaDisp->reserved2 = 0;
-    hsaDisp->completion_signal = 0;
+    hsaDisp->completion_signal.handle = 0;
 
     memList.push_back(cb);
     memList.push_back(gpuAqlCode());
diff --git a/rocclr/runtime/device/gpu/gpuprogram.cpp b/rocclr/runtime/device/gpu/gpuprogram.cpp
index 3443fb7254..1ff6c16070 100644
--- a/rocclr/runtime/device/gpu/gpuprogram.cpp
+++ b/rocclr/runtime/device/gpu/gpuprogram.cpp
@@ -102,26 +102,26 @@ InitializeSamplerObject(void* userData, uint64_t offset, bool unnormalize,
 
     uint32_t    state = (unnormalize) ?
         amd::Sampler::StateNormalizedCoordsFalse : amd::Sampler::StateNormalizedCoordsTrue;
-    if (filter == HSA_EXT_SAMPLER_FILTER_LINEAR) {
+    if (filter == HSA_EXT_SAMPLER_FILTER_MODE_LINEAR) {
         state |= amd::Sampler::StateFilterNearest;
     }
-    else if (filter == HSA_EXT_SAMPLER_FILTER_LINEAR) {
+    else if (filter == HSA_EXT_SAMPLER_FILTER_MODE_LINEAR) {
         state |= amd::Sampler::StateFilterLinear;
     }
     switch (boundaryU) {
-    case HSA_EXT_SAMPLER_ADDRESSING_CLAMP_TO_EDGE:
+    case HSA_EXT_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE:
         state |= amd::Sampler::StateAddressClampToEdge;
         break;
-    case HSA_EXT_SAMPLER_ADDRESSING_CLAMP_TO_BORDER:
+    case HSA_EXT_SAMPLER_ADDRESSING_MODE_CLAMP_TO_BORDER:
         state |= amd::Sampler::StateAddressClamp;
         break;
-    case HSA_EXT_SAMPLER_ADDRESSING_REPEAT:
+    case HSA_EXT_SAMPLER_ADDRESSING_MODE_REPEAT:
         state |= amd::Sampler::StateAddressRepeat;
         break;
-    case HSA_EXT_SAMPLER_ADDRESSING_MIRRORED_REPEAT:
+    case HSA_EXT_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT:
         state |= amd::Sampler::StateAddressMirroredRepeat;
         break;
-    case HSA_EXT_SAMPLER_ADDRESSING_UNDEFINED:
+    case HSA_EXT_SAMPLER_ADDRESSING_MODE_UNDEFINED:
     default:
         break;
     }