Catkin-related fixes