a couple of missing things around import h2o* in the last push