* tokenSource fixes