Updates and catkin for hydro