Fixed bugs in ROS