fixing further catkin issues