diff --git a/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.cpp b/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.cpp
index 96fc1df3..d60bece8 100644
--- a/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.cpp
+++ b/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.cpp
@@ -196,7 +196,7 @@ rmw_context_impl_s::rmw_context_impl_s(
   // Initialize the zenoh session.
   z_owned_session_t session = z_open(z_move(config));
   if (!z_session_check(&session)) {
-    throw std::runtime_error("Error setting up zenoh session");
+    throw std::runtime_error("Error setting up zenoh session.");
   }
   auto close_session = rcpputils::make_scope_exit(
     [&session]() {
@@ -267,7 +267,7 @@ rmw_context_impl_s::rmw_context_impl_s(
       z_drop(z_move(keystr));
     } else {
       RMW_ZENOH_LOG_DEBUG_NAMED(
-        "rmw_zenoh_cpp", "[rmw_context_impl_s] z_call received an invalid reply\n");
+        "rmw_zenoh_cpp", "[rmw_context_impl_s] z_call received an invalid reply.\n");
     }
   }
   z_drop(z_move(reply));
diff --git a/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp b/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp
index 926d0989..3cb6f474 100644
--- a/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp
+++ b/rmw_zenoh_cpp/src/detail/rmw_context_impl_s.hpp
@@ -17,6 +17,7 @@
 
 #include <zenoh.h>
 
+# include <cstddef>
 #include <memory>
 #include <mutex>
 #include <optional>
@@ -115,12 +116,12 @@ class rmw_context_impl_s final
     std::shared_ptr<rmw_zenoh_cpp::GraphCache> graph_cache_;
     // ROS graph liveliness subscriber.
     z_owned_subscriber_t graph_subscriber_;
-    // Equivalent to rmw_dds_common::Context's guard condition
-    /// Guard condition that should be triggered when the graph changes.
+    // Equivalent to rmw_dds_common::Context's guard condition.
+    // Guard condition that should be triggered when the graph changes.
     std::unique_ptr<rmw_guard_condition_t> graph_guard_condition_;
     // The GuardCondition data structure.
     rmw_zenoh_cpp::GuardCondition guard_condition_data_;
-    /// Shutdown flag.
+    // Shutdown flag.
     bool is_shutdown_;
     // A counter to assign a local id for every entity created in this session.
     size_t next_entity_id_;