diff --git a/flexiv_controllers/include/flexiv_controllers/cartesian_pose_sensor.hpp b/flexiv_controllers/include/flexiv_controllers/cartesian_pose_sensor.hpp
index 503ef18..5886fa8 100644
--- a/flexiv_controllers/include/flexiv_controllers/cartesian_pose_sensor.hpp
+++ b/flexiv_controllers/include/flexiv_controllers/cartesian_pose_sensor.hpp
@@ -1,7 +1,7 @@
 /**
  * @file cartesian_pose_sensor.hpp
  * @brief Sensor interface to read the Cartesian pose. Adapted from
- * ros2_control/semantic_components/include/semantic_components/force_torque_sensor.hpp
+ * ros2_control/controller_interface/include/semantic_components/force_torque_sensor.hpp
  * @copyright Copyright (C) 2016-2021 Flexiv Ltd. All Rights Reserved.
  * @author Flexiv
  */
@@ -19,8 +19,7 @@
 
 namespace flexiv_controllers {
 class CartesianPoseSensor
-: public semantic_components::SemanticComponentInterface<
-      geometry_msgs::msg::Pose>
+: public semantic_components::SemanticComponentInterface<geometry_msgs::msg::Pose>
 {
 public:
     CartesianPoseSensor(const std::string& name)
@@ -38,10 +37,9 @@ class CartesianPoseSensor
         std::fill(existing_axes_.begin(), existing_axes_.end(), true);
 
         // Set default position and orientation values to NaN
-        std::fill(positions_.begin(), positions_.end(),
-            std::numeric_limits<double>::quiet_NaN());
-        std::fill(orientations_.begin(), orientations_.end(),
-            std::numeric_limits<double>::quiet_NaN());
+        std::fill(positions_.begin(), positions_.end(), std::numeric_limits<double>::quiet_NaN());
+        std::fill(
+            orientations_.begin(), orientations_.end(), std::numeric_limits<double>::quiet_NaN());
     }
 
     virtual ~CartesianPoseSensor() = default;
@@ -49,12 +47,11 @@ class CartesianPoseSensor
     /// Return positions
     std::array<double, 3>& get_positions()
     {
-        size_t interface_counter = 0;
+        size_t position_interface_counter = 0;
         for (size_t i = 0; i < 3; ++i) {
             if (existing_axes_[i]) {
-                positions_[i]
-                    = state_interfaces_[interface_counter].get().get_value();
-                ++interface_counter;
+                positions_[i] = state_interfaces_[position_interface_counter].get().get_value();
+                ++position_interface_counter;
             }
         }
         return positions_;
@@ -63,12 +60,13 @@ class CartesianPoseSensor
     /// Return orientations
     std::array<double, 4>& get_orientations()
     {
-        size_t interface_counter = 0;
+        auto orientation_interface_counter
+            = std::count(existing_axes_.begin(), existing_axes_.begin() + 3, true);
         for (size_t i = 3; i < 7; ++i) {
             if (existing_axes_[i]) {
                 orientations_[i - 3]
-                    = state_interfaces_[interface_counter].get().get_value();
-                ++interface_counter;
+                    = state_interfaces_[orientation_interface_counter].get().get_value();
+                ++orientation_interface_counter;
             }
         }
         return orientations_;
diff --git a/flexiv_controllers/src/tcp_pose_state_broadcaster.cpp b/flexiv_controllers/src/tcp_pose_state_broadcaster.cpp
index 1224d4c..b914d4d 100644
--- a/flexiv_controllers/src/tcp_pose_state_broadcaster.cpp
+++ b/flexiv_controllers/src/tcp_pose_state_broadcaster.cpp
@@ -78,7 +78,7 @@ CallbackReturn TcpPoseStateBroadcaster::on_configure(
     }
 
     try {
-        // register ft sensor data publisher
+        // register TCP pose data publisher
         sensor_state_publisher_ = get_node()->create_publisher<geometry_msgs::msg::PoseStamped>(
             "~/" + topic_name_, rclcpp::SystemDefaultsQoS());
         realtime_publisher_ = std::make_unique<StatePublisher>(sensor_state_publisher_);
@@ -99,10 +99,10 @@ CallbackReturn TcpPoseStateBroadcaster::on_configure(
 }
 
 controller_interface::return_type TcpPoseStateBroadcaster::update(
-    const rclcpp::Time& /*time*/, const rclcpp::Duration& /*period*/)
+    const rclcpp::Time& time, const rclcpp::Duration& /*period*/)
 {
     if (realtime_publisher_ && realtime_publisher_->trylock()) {
-        realtime_publisher_->msg_.header.stamp = get_node()->now();
+        realtime_publisher_->msg_.header.stamp = time;
         cartesian_pose_sensor_->get_values_as_message(realtime_publisher_->msg_.pose);
         realtime_publisher_->unlockAndPublish();
     }
@@ -129,4 +129,4 @@ CallbackReturn TcpPoseStateBroadcaster::on_deactivate(
 #include "pluginlib/class_list_macros.hpp"
 
 PLUGINLIB_EXPORT_CLASS(
-    flexiv_controllers::TcpPoseStateBroadcaster, controller_interface::ControllerInterface)
\ No newline at end of file
+    flexiv_controllers::TcpPoseStateBroadcaster, controller_interface::ControllerInterface)