Update estimator to build on 7.8

Hi Jamey,

I haven't tried this against 7.6, but these changes are needed for building with 7.8.

Fixes #1