Some more fixes regarding token output.