More token fixes