More tweaks to hp