Minor changes to tokens