Fixes to automatically pull in catkin deps