Tiny HOPE tweaks
Merge pull request #1956 from kennknowles/hope-api-tweaks

Tiny HOPE tweaks