hydro/pcl 1.7 fixes