Fix Skill Tokens too