further token fixes