Tweak some token things