Fix tokens