diff --git a/rocclr/device/pal/palcdefs b/rocclr/device/pal/palcdefs
index 0892b8d4bd..6c50a9b739 100644
--- a/rocclr/device/pal/palcdefs
+++ b/rocclr/device/pal/palcdefs
@@ -1,3 +1,3 @@
 # PAL interface versions
-PAL_MAJOR_VERSION = 592
+PAL_MAJOR_VERSION = 610
 GPUOPEN_MAJOR_VERSION = 41
diff --git a/rocclr/device/pal/paldevice.cpp b/rocclr/device/pal/paldevice.cpp
index cb63f93a91..035b5ad0f2 100755
--- a/rocclr/device/pal/paldevice.cpp
+++ b/rocclr/device/pal/paldevice.cpp
@@ -902,10 +902,12 @@ bool Device::create(Pal::IDevice* device) {
   }
   appProfile_.init();
   device_ = device;
-  Pal::Result result;
 
   // Retrive device properties
-  result = iDev()->GetProperties(&properties_);
+  Pal::Result result = iDev()->GetProperties(&properties_);
+  if (result != Pal::Result::Success) {
+    return false;
+  }
 
   // Save the IP level for the offline detection
   ipLevel_ = properties().gfxLevel;
@@ -965,12 +967,14 @@ bool Device::create(Pal::IDevice* device) {
   palSettings->longRunningSubmissions = true;
   palSettings->cmdBufBatchedSubmitChainLimit = 0;
   palSettings->disableResourceProcessingManager = true;
-  palSettings->numScratchWavesPerCu = settings().numScratchWavesPerCu_;
   // Make sure CP DMA can be used for all possible transfers
   palSettings->cpDmaCmdCopyMemoryMaxBytes = 0xFFFFFFFF;
 
   // Commit the new settings for the device
   result = iDev()->CommitSettingsAndInit();
+  if (result != Pal::Result::Success) {
+    return false;
+  }
 
   iDev()->GetGpuMemoryHeapProperties(heaps_);
 
diff --git a/rocclr/device/pal/palvirtual.cpp b/rocclr/device/pal/palvirtual.cpp
index 0a4e1d3a52..5a8e0f6d38 100644
--- a/rocclr/device/pal/palvirtual.cpp
+++ b/rocclr/device/pal/palvirtual.cpp
@@ -3636,11 +3636,6 @@ void VirtualGPU::buildKernelInfo(const HSAILKernel& hsaKernel, hsa_kernel_dispat
     dbgSetting.aclBinary_ = hsaKernel.prog().binaryElf();
     dbgSetting.event_ = enqueueEvent;
 
-    // Call the predispatch callback function & set the trap info
-    AqlCodeInfo aqlCodeInfo;
-    aqlCodeInfo.aqlCode_ = (amd_kernel_code_t*)hsaKernel.cpuAqlCode();
-    aqlCodeInfo.aqlCodeSize_ = hsaKernel.aqlCodeSize();
-
     // Execute the pre-dispatch call back function
     dbgManager->executePreDispatchCallBack(reinterpret_cast<void*>(aqlPkt), &dbgSetting);
 
@@ -3651,7 +3646,7 @@ void VirtualGPU::buildKernelInfo(const HSAILKernel& hsaKernel, hsa_kernel_dispat
 
     kernelInfo.trapPresent = (kernelInfo.trapHandler) ? true : false;
 
-    // Execption policy
+    // Exception policy
     kernelInfo.excpEn = dbgSetting.exceptionMask_;
     kernelInfo.cacheDisableMask = dbgSetting.cacheDisableMask_;
     kernelInfo.sqDebugMode = dbgSetting.gpuSingleStepMode_;