minor catkin fixes