Token workflow tweaks