Fix issues with Circle tokens being revoked