Various finalizations on the HP