diff --git a/sycl/include/CL/sycl/handler.hpp b/sycl/include/CL/sycl/handler.hpp
index 77db78115de05..370abcfb0b013 100644
--- a/sycl/include/CL/sycl/handler.hpp
+++ b/sycl/include/CL/sycl/handler.hpp
@@ -1589,7 +1589,7 @@ class __SYCL_EXPORT handler {
     // Make sure data shared_ptr points to is not released until we finish
     // work with it.
     MSharedPtrStorage.push_back(Dst);
-    T_Dst *RawDstPtr = Dst.get();
+    typename shared_ptr_class<T_Dst>::element_type *RawDstPtr = Dst.get();
     copy(Src, RawDstPtr);
   }
 
@@ -1612,7 +1612,7 @@ class __SYCL_EXPORT handler {
     // Make sure data shared_ptr points to is not released until we finish
     // work with it.
     MSharedPtrStorage.push_back(Src);
-    T_Src *RawSrcPtr = Src.get();
+    typename shared_ptr_class<T_Src>::element_type *RawSrcPtr = Src.get();
     copy(RawSrcPtr, Dst);
   }
 
diff --git a/sycl/test/basic_tests/handler/handler_mem_op.cpp b/sycl/test/basic_tests/handler/handler_mem_op.cpp
index 2f9460051ed23..c0d3b1b10d4e8 100644
--- a/sycl/test/basic_tests/handler/handler_mem_op.cpp
+++ b/sycl/test/basic_tests/handler/handler_mem_op.cpp
@@ -348,7 +348,7 @@ template <typename T> void test_copy_acc_ptr() {
 template <typename T> void test_copy_shared_ptr_acc() {
   const size_t Size = 10;
   T Data[Size] = {0};
-  std::shared_ptr<T> Values(new T[Size]());
+  std::shared_ptr<T[]> Values(new T[Size]());
   for (size_t I = 0; I < Size; ++I) {
     Values.get()[I] = I;
   }
@@ -369,7 +369,7 @@ template <typename T> void test_copy_shared_ptr_acc() {
 template <typename T> void test_copy_shared_ptr_const_acc() {
   constexpr size_t Size = 10;
   T Data[Size] = {0};
-  std::shared_ptr<const T> Values(new T[Size]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
+  std::shared_ptr<const T[]> Values(new T[Size]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9});
   {
     buffer<T, 1> Buffer(Data, range<1>(Size));
     queue Queue;
@@ -390,7 +390,7 @@ template <typename T> void test_copy_acc_shared_ptr() {
   for (size_t I = 0; I < Size; ++I) {
     Data[I] = I;
   }
-  std::shared_ptr<T> Values(new T[Size]());
+  std::shared_ptr<T[]> Values(new T[Size]());
   {
     buffer<T, 1> Buffer(Data, range<1>(Size));
     queue Queue;