minor tweaks for TokenBuffer