Minor changes required for ROS wrapper