Fix token key fetching