Small tweaks for shield and evade