more fixes to HP