catkin build fixes (still not working)