Hope api fixes

A bit more smoke-tested with some real data.