diff --git a/rocclr/runtime/device/pal/paldevice.cpp b/rocclr/runtime/device/pal/paldevice.cpp
index 930bfa0f0b..167f9590d1 100644
--- a/rocclr/runtime/device/pal/paldevice.cpp
+++ b/rocclr/runtime/device/pal/paldevice.cpp
@@ -928,7 +928,7 @@ Device::createVirtualDevice(
 {
     bool    profiling = false;
     bool    interopQueue = false;
-    uint    rtCUs  = 0;
+    uint    rtCUs  = amd::CommandQueue::RealTimeDisabled;
     uint    deviceQueueSize = 0;
 
     if (queue != nullptr) {
diff --git a/rocclr/runtime/device/pal/palkernel.cpp b/rocclr/runtime/device/pal/palkernel.cpp
index bad47c2b93..2f3d1c1eab 100644
--- a/rocclr/runtime/device/pal/palkernel.cpp
+++ b/rocclr/runtime/device/pal/palkernel.cpp
@@ -141,8 +141,10 @@ GetHSAILAddrQual(const aclArgData* argInfo)
 {
     if (argInfo->type == ARG_TYPE_POINTER) {
         switch (argInfo->arg.pointer.memory) {
+            case PTR_MT_UAV_CONSTANT:
             case PTR_MT_CONSTANT_EMU:
             case PTR_MT_CONSTANT:
+                return HSAIL_ADDRESS_CONSTANT;
             case PTR_MT_UAV:
             case PTR_MT_GLOBAL:
                 return HSAIL_ADDRESS_GLOBAL;