diff --git a/xds/src/main/java/io/grpc/xds/InternalXdsAttributes.java b/xds/src/main/java/io/grpc/xds/InternalXdsAttributes.java
index 229bcff583..5fc06b9694 100644
--- a/xds/src/main/java/io/grpc/xds/InternalXdsAttributes.java
+++ b/xds/src/main/java/io/grpc/xds/InternalXdsAttributes.java
@@ -44,7 +44,7 @@ public final class InternalXdsAttributes {
    */
   @NameResolver.ResolutionResultAttr
   static final Attributes.Key<ObjectPool<XdsClient>> XDS_CLIENT_POOL =
-      Attributes.Key.create("io.grpc.xds.XdsAttributes.xdsClientPool");
+      Attributes.Key.create("io.grpc.xds.InternalXdsAttributes.xdsClientPool");
 
   /**
    * Attribute key for obtaining the global provider that provides atomics for aggregating
@@ -52,7 +52,7 @@ public final class InternalXdsAttributes {
    */
   @NameResolver.ResolutionResultAttr
   static final Attributes.Key<CallCounterProvider> CALL_COUNTER_PROVIDER =
-      Attributes.Key.create("io.grpc.xds.XdsAttributes.callCounterProvider");
+      Attributes.Key.create("io.grpc.xds.InternalXdsAttributes.callCounterProvider");
 
   /**
    * Name of the cluster that provides this EquivalentAddressGroup.
@@ -65,7 +65,7 @@ public final class InternalXdsAttributes {
   // TODO (chengyuanzhang): temporary solution for migrating to LRS policy. Should access
   //   stats object via XdsClient interface.
   static final Attributes.Key<LoadStatsStore> ATTR_CLUSTER_SERVICE_LOAD_STATS_STORE =
-      Attributes.Key.create("io.grpc.xds.XdsAttributes.loadStatsStore");
+      Attributes.Key.create("io.grpc.xds.InternalXdsAttributes.loadStatsStore");
 
   private InternalXdsAttributes() {}
 }
diff --git a/xds/src/main/java/io/grpc/xds/XdsClient.java b/xds/src/main/java/io/grpc/xds/XdsClient.java
index 4aae1cc2f7..8da3601fd1 100644
--- a/xds/src/main/java/io/grpc/xds/XdsClient.java
+++ b/xds/src/main/java/io/grpc/xds/XdsClient.java
@@ -85,7 +85,7 @@ abstract class XdsClient {
         return false;
       }
       LdsUpdate that = (LdsUpdate) o;
-      return Objects.equals(httpMaxStreamDurationNano, that.httpMaxStreamDurationNano)
+      return httpMaxStreamDurationNano == that.httpMaxStreamDurationNano
           && Objects.equals(rdsName, that.rdsName)
           && Objects.equals(virtualHosts, that.virtualHosts);
     }
diff --git a/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java b/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
index 2083876dab..7df19c0be1 100644
--- a/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
+++ b/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
@@ -243,7 +243,6 @@ public class XdsNameResolverTest {
             Collections.singletonList(route2)));
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   public void resolved_noTimeout() {
     resolver.start(mockListener);