Minor ROS fixes