Small fixes to ensure compatability with new hpess/base