Really fix the Spigot health issue (with a twist).
Fix Spigot issue with skeleton/wolf targetting.