diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java
index 6174fb5627..922a8b6197 100644
--- a/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java
+++ b/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java
@@ -208,7 +208,6 @@ class GrpclbLoadBalancer extends LoadBalancer {
    * Gets a list from an object for the given key.  Copy of
    * {@link io.grpc.internal.ServiceConfigUtil#getList}.
    */
-  @SuppressWarnings("unchecked")
   @Nullable
   private static List<?> getList(Map<String, ?> obj, String key) {
     assert key != null;
diff --git a/xds/src/main/java/io/grpc/xds/XdsClientImpl.java b/xds/src/main/java/io/grpc/xds/XdsClientImpl.java
index 83340d070b..dea30bcc9a 100644
--- a/xds/src/main/java/io/grpc/xds/XdsClientImpl.java
+++ b/xds/src/main/java/io/grpc/xds/XdsClientImpl.java
@@ -680,7 +680,7 @@ final class XdsClientImpl extends XdsClient {
       List<Route> routes = targetVirtualHost.getRoutesList();
       if (!routes.isEmpty()) {
         Route route = routes.get(routes.size() - 1);
-        if (route.getMatch().getPrefix().equals("")) {
+        if (route.getMatch().getPrefix().isEmpty()) {
           if (route.hasRoute()) {
             return route.getRoute().getCluster();
           }