Update for catkin-related errors.