Fixes for Hydro / PCL 1.7 compatibility.