diff --git a/opal/mca/accelerator/rocm/accelerator_rocm_module.c b/opal/mca/accelerator/rocm/accelerator_rocm_module.c
index a769e929c15..8f1bb2caa44 100644
--- a/opal/mca/accelerator/rocm/accelerator_rocm_module.c
+++ b/opal/mca/accelerator/rocm/accelerator_rocm_module.c
@@ -90,11 +90,8 @@ static int mca_accelerator_rocm_check_addr (const void *addr, int *dev_id, uint6
 #else
         if (hipMemoryTypeDevice == srcAttr.memoryType) {
 #endif
-            //We might want to set additional flags in a later iteration.
-            //*flags |= MCA_ACCELERATOR_FLAGS_HOST_LDSTR;
-            //*flags |= MCA_ACCELERATOR_FLAGS_HOST_ATOMICS;
-            /* First access on a device pointer triggers ROCM support lazy initialization. */
             opal_accelerator_rocm_lazy_init();
+            *dev_id = srcAttr.device;
             ret = 1;
 #if HIP_VERSION >= 50731921
         } else if (hipMemoryTypeUnified == srcAttr.type) {
@@ -102,8 +99,8 @@ static int mca_accelerator_rocm_check_addr (const void *addr, int *dev_id, uint6
         } else if (hipMemoryTypeUnified == srcAttr.memoryType) {
 #endif
             *flags |= MCA_ACCELERATOR_FLAGS_UNIFIED_MEMORY;
-            //*flags |= MCA_ACCELERATOR_FLAGS_HOST_LDSTR;
-            //*flags |= MCA_ACCELERATOR_FLAGS_HOST_ATOMICS;
+            opal_accelerator_rocm_lazy_init();
+            *dev_id = srcAttr.device;
             ret = 1;
         }
     }
@@ -551,7 +548,7 @@ static int mca_accelerator_rocm_get_buffer_id(int dev_id, const void *addr, opal
     *buf_id = 0;
 
 #if HIP_VERSION >= 50120531
-    hipError_t result = hipPointerGetAttribute((unsigned long long *)&buf_id, HIP_POINTER_ATTRIBUTE_BUFFER_ID,
+    hipError_t result = hipPointerGetAttribute((unsigned long long *)buf_id, HIP_POINTER_ATTRIBUTE_BUFFER_ID,
                                                (hipDeviceptr_t)addr);
     if (hipSuccess != result) {
         opal_output_verbose(10, opal_accelerator_base_framework.framework_output,