diff --git a/rmw_connextdds_common/include/rmw_connextdds/rmw_impl.hpp b/rmw_connextdds_common/include/rmw_connextdds/rmw_impl.hpp
index da98ad57..8895d868 100644
--- a/rmw_connextdds_common/include/rmw_connextdds/rmw_impl.hpp
+++ b/rmw_connextdds_common/include/rmw_connextdds/rmw_impl.hpp
@@ -64,8 +64,7 @@ bool rmw_connextdds_find_string_in_list(
   const DDS_StringSeq * const values,
   const char * const value);
 
-rmw_ret_t rmw_connextdds_duration_from_ros_time(
-  DDS_Duration_t * const duration,
+DDS_Duration_t rmw_connextdds_duration_from_ros_time(
   const rmw_time_t * const ros_time);
 
 /******************************************************************************
diff --git a/rmw_connextdds_common/src/common/rmw_impl.cpp b/rmw_connextdds_common/src/common/rmw_impl.cpp
index 2e5ed208..d57de0fe 100644
--- a/rmw_connextdds_common/src/common/rmw_impl.cpp
+++ b/rmw_connextdds_common/src/common/rmw_impl.cpp
@@ -221,16 +221,17 @@ rmw_connextdds_find_string_in_list(
   return false;
 }
 
-rmw_ret_t
+DDS_Duration_t
 rmw_connextdds_duration_from_ros_time(
   DDS_Duration_t * const duration,
   const rmw_time_t * const ros_time)
 {
   rmw_time_t in_time = rmw_dds_common::clamp_rmw_time_to_dds_time(*ros_time);
 
-  duration->sec = static_cast<DDS_Long>(in_time.sec);
-  duration->nanosec = static_cast<DDS_UnsignedLong>(in_time.nsec);
-  return RMW_RET_OK;
+  DDS_Duration_t duration;
+  duration.sec = static_cast<DDS_Long>(in_time.sec);
+  duration.nanosec = static_cast<DDS_UnsignedLong>(in_time.nsec);
+  return duration;
 }
 
 /******************************************************************************
@@ -945,7 +946,7 @@ RMW_Connext_Publisher::wait_for_all_acked(rmw_time_t wait_timeout)
   DDS_Duration_t timeout = DDS_DURATION_INFINITE;
 
   if (!rmw_time_equal(wait_timeout, RMW_DURATION_INFINITE)) {
-    rmw_connextdds_duration_from_ros_time(&timeout, &wait_timeout);
+    timeout = rmw_connextdds_duration_from_ros_time(&wait_timeout);
   }
 
   const DDS_ReturnCode_t dds_rc =
diff --git a/rmw_connextddsmicro/src/rmw_api_impl_rtime.cpp b/rmw_connextddsmicro/src/rmw_api_impl_rtime.cpp
index baffb347..cac394cf 100644
--- a/rmw_connextddsmicro/src/rmw_api_impl_rtime.cpp
+++ b/rmw_connextddsmicro/src/rmw_api_impl_rtime.cpp
@@ -424,7 +424,7 @@ rmw_publisher_wait_for_all_acked(
 }
 
 
-mw_ret_t
+rmw_ret_t
 rmw_publisher_get_actual_qos(
   const rmw_publisher_t * publisher,
   rmw_qos_profile_t * qos)