Update catkin version and fix some bugs