Fixes for compatibility with Hydro & PCL 1.7.