Fixes for token fetching.