HP: Wither tweaks