Fixed more tokens