Minor HP tweaks