Fix token handling.