Some minor fixes to support fhh heaultvault loading