More tweaks for shield tokens