Fix Token class issues