Close #1 #2

Simple fixes to get the package to build on Hydro.