Improve catkin port