Bugfixes in ROS