few changes to get things working under hydro with catkin