Fixed some build issues in Catkin.