HP: Patronus fixes/tweaks