minor fixes for catkin build