Fix string interpolation in token handling