Fix nightly make check stuff.

Still had some of the interface stuff slightly wrong.  This passes on Natureboy.