get token fixes