Fix token loading etc