Fix secure tokens