diff --git a/opal/mca/accelerator/rocm/accelerator_rocm.h b/opal/mca/accelerator/rocm/accelerator_rocm.h
index 38409778ad4..8eab728b4d2 100644
--- a/opal/mca/accelerator/rocm/accelerator_rocm.h
+++ b/opal/mca/accelerator/rocm/accelerator_rocm.h
@@ -41,7 +41,7 @@ typedef struct {
 } opal_accelerator_rocm_component_t;
 
 OPAL_DECLSPEC extern opal_accelerator_rocm_component_t mca_accelerator_rocm_component;
-OPAL_DECLSPEC extern opal_accelerator_base_module_t opal_accelerator_rocm_module;
+extern opal_accelerator_base_module_t opal_accelerator_rocm_module;
 
 struct opal_accelerator_rocm_stream_t {
     opal_accelerator_stream_t base;
@@ -67,12 +67,12 @@ struct opal_accelerator_rocm_ipc_event_handle_t {
 typedef struct opal_accelerator_rocm_ipc_event_handle_t opal_accelerator_rocm_ipc_event_handle_t;
 OBJ_CLASS_DECLARATION(opal_accelerator_rocm_ipc_event_handle_t);
 
-OPAL_DECLSPEC extern hipStream_t opal_accelerator_rocm_MemcpyStream;
-OPAL_DECLSPEC extern int opal_accelerator_rocm_memcpy_async;
-OPAL_DECLSPEC extern int opal_accelerator_rocm_verbose;
-OPAL_DECLSPEC extern size_t opal_accelerator_rocm_memcpyH2D_limit;
-OPAL_DECLSPEC extern size_t opal_accelerator_rocm_memcpyD2H_limit;
+extern hipStream_t opal_accelerator_rocm_MemcpyStream;
+extern int opal_accelerator_rocm_memcpy_async;
+extern int opal_accelerator_rocm_verbose;
+extern size_t opal_accelerator_rocm_memcpyH2D_limit;
+extern size_t opal_accelerator_rocm_memcpyD2H_limit;
 
-OPAL_DECLSPEC extern int opal_accelerator_rocm_lazy_init(void);
+extern int opal_accelerator_rocm_lazy_init(void);
 
 #endif
diff --git a/opal/mca/accelerator/rocm/accelerator_rocm_component.c b/opal/mca/accelerator/rocm/accelerator_rocm_component.c
index 8f1bbbb53a5..2f40c0e35f5 100644
--- a/opal/mca/accelerator/rocm/accelerator_rocm_component.c
+++ b/opal/mca/accelerator/rocm/accelerator_rocm_component.c
@@ -176,6 +176,7 @@ int opal_accelerator_rocm_lazy_init()
 
     err = hipStreamCreate(&opal_accelerator_rocm_MemcpyStream);
     if (hipSuccess != err) {
+	err = OPAL_ERROR;  // we got hipErrorInvalidValue, pretty bad
         opal_output(0, "Could not create hipStream, err=%d %s\n",
                 err, hipGetErrorString(err));
         goto out;