more token fixes