Fixes to support new hpess/base