diff --git a/oshmem/mca/sshmem/ucx/sshmem_ucx_module.c b/oshmem/mca/sshmem/ucx/sshmem_ucx_module.c
index 52b4d56062..a069bf5cd2 100644
--- a/oshmem/mca/sshmem/ucx/sshmem_ucx_module.c
+++ b/oshmem/mca/sshmem/ucx/sshmem_ucx_module.c
@@ -226,6 +226,7 @@ segment_create(map_segment_t *ds_buf,
     int ret;
 
 #if HAVE_UCX_DEVICE_MEM
+    int ret = OSHMEM_ERROR;
     if (hint & SHMEM_HINT_DEVICE_NIC_MEM) {
         if (size > UINT_MAX) {
             return OSHMEM_ERR_BAD_PARAM;
diff --git a/oshmem/shmem/c/shmem_set.c b/oshmem/shmem/c/shmem_set.c
index 5091882714..30fef842cb 100644
--- a/oshmem/shmem/c/shmem_set.c
+++ b/oshmem/shmem/c/shmem_set.c
@@ -27,17 +27,18 @@
         int rc = OSHMEM_SUCCESS;                                    \
         size_t size = 0;                                            \
         type out_value;                                             \
-                                                                    \
+        uint64_t value_tmp;                                         \
         RUNTIME_CHECK_INIT();                                       \
         RUNTIME_CHECK_PE(pe);                                       \
         RUNTIME_CHECK_ADDR(target);                                 \
                                                                     \
         size = sizeof(out_value);                                   \
+        memcpy(&value_tmp, &value, size);                           \
         rc = MCA_ATOMIC_CALL(swap(                                  \
             ctx,                                                    \
             (void*)target,                                          \
             (void*)&out_value,                                      \
-            value,                                                  \
+            value_tmp,                                              \
             size,                                                   \
             pe));                                                   \
         RUNTIME_CHECK_RC(rc);                                       \