Minor changes for compatibility with new Catkin simple