Tiny tweaks to token flow