fix patcher when running with ROS
merge fixes