Fix some token issues.