More HP fixes