More shield tweaks.