Fix token validation