diff --git a/sycl/include/sycl/handler.hpp b/sycl/include/sycl/handler.hpp
index 4f6d6d51af16c..9d4038a318b78 100644
--- a/sycl/include/sycl/handler.hpp
+++ b/sycl/include/sycl/handler.hpp
@@ -1875,7 +1875,7 @@ class __SYCL_EXPORT handler {
     setArgsToAssociatedAccessors();
 
     SetHostTask(std::move(Func));
-    setType(detail::CGType::CodeplayHostTask);
+    setType(detail::CGType::EnqueueNativeCommand);
   }
 
   /// @brief Get the command graph if any associated with this handler. It can
diff --git a/sycl/source/detail/scheduler/commands.cpp b/sycl/source/detail/scheduler/commands.cpp
index 010d366c85416..5e13f5ba5c8e0 100644
--- a/sycl/source/detail/scheduler/commands.cpp
+++ b/sycl/source/detail/scheduler/commands.cpp
@@ -3162,8 +3162,8 @@ ur_result_t ExecCGCommand::enqueueImpQueue() {
             Req->MSYCLMemObj->MRecord->MAllocaCommands;
 
         for (AllocaCommandBase *AllocaCmd : AllocaCmds)
-          if (HostTask->MQueue->getContextImplPtr() ==
-              AllocaCmd->getQueue()->getContextImplPtr()) {
+          if (getContext(HostTask->MQueue) ==
+              getContext(AllocaCmd->getQueue())) {
             auto MemArg = reinterpret_cast<ur_mem_handle_t>(
                 AllocaCmd->getMemAllocation());
             ReqToMem.emplace_back(std::make_pair(Req, MemArg));
@@ -3177,7 +3177,8 @@ ur_result_t ExecCGCommand::enqueueImpQueue() {
 
         throw sycl::exception(
             sycl::make_error_code(sycl::errc::runtime),
-            "Can't get memory object due to no allocation available ");
+            "Can't get memory object due to no allocation available " +
+                codeToString(UR_RESULT_ERROR_INVALID_MEM_OBJECT));
       };
       std::for_each(std::begin(HandlerReq), std::end(HandlerReq), ReqToMemConv);
       std::sort(std::begin(ReqToMem), std::end(ReqToMem));
diff --git a/sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp b/sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp
index 6e409113aa26b..d4a1cb96101bc 100644
--- a/sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp
+++ b/sycl/test-e2e/EnqueueNativeCommand/custom-command-multiple-dev-cuda.cpp
@@ -3,7 +3,7 @@
 // RUN: %{run} %t.out
 
 // TODO: Reenable, see https://github.com/intel/llvm/issues/14598
-// UNSUPPORTED: windows, linux
+// UNSUPPORTED: windows
 
 #include <cuda.h>