Minor Fixes, Tokens