Fix token loading