diff --git a/core/src/main/java/io/grpc/internal/ClientCallImpl.java b/core/src/main/java/io/grpc/internal/ClientCallImpl.java
index f78e48d8c6..b2986b64a5 100644
--- a/core/src/main/java/io/grpc/internal/ClientCallImpl.java
+++ b/core/src/main/java/io/grpc/internal/ClientCallImpl.java
@@ -81,7 +81,7 @@ final class ClientCallImpl<ReqT, RespT> extends ClientCall<ReqT, RespT> {
   private boolean halfCloseCalled;
   private final ClientTransportProvider clientTransportProvider;
   private final CancellationListener cancellationListener = new ContextCancellationListener();
-  private ScheduledExecutorService deadlineCancellationExecutor;
+  private final ScheduledExecutorService deadlineCancellationExecutor;
   private boolean fullStreamDecompression;
   private DecompressorRegistry decompressorRegistry = DecompressorRegistry.getDefaultInstance();
   private CompressorRegistry compressorRegistry = CompressorRegistry.getDefaultInstance();
diff --git a/core/src/main/java/io/grpc/internal/ServiceConfigUtil.java b/core/src/main/java/io/grpc/internal/ServiceConfigUtil.java
index 7e8f4610b0..888f48f511 100644
--- a/core/src/main/java/io/grpc/internal/ServiceConfigUtil.java
+++ b/core/src/main/java/io/grpc/internal/ServiceConfigUtil.java
@@ -278,20 +278,6 @@ public final class ServiceConfigUtil {
         String.format("value %s for key %s in %s is not object", value, key, obj));
   }
 
-  /**
-   * Gets an object from a list of objects for the given index.
-   */
-  @SuppressWarnings("unchecked")
-  private static Map<String, Object> getObject(List<Object> list, int i) {
-    assert i >= 0 && i < list.size();
-    Object value = checkNotNull(list.get(i), "idx %s in %s is null", i, list);
-    if (value instanceof Map) {
-      return (Map<String, Object>) value;
-    }
-    throw new ClassCastException(
-        String.format("value %s for idx %d in %s is not a map", value, i, list));
-  }
-
   /**
    * Gets a double from an object for the given key.
    */
diff --git a/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java b/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java
index 6f3e5d3ed3..acdb5387b0 100644
--- a/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java
+++ b/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java
@@ -464,7 +464,7 @@ public class RoundRobinLoadBalancerTest {
 
     verify(mockArgs, atLeast(4)).getHeaders();
     assertNotNull(loadBalancer.getStickinessMapForTest());
-    assertThat(loadBalancer.getStickinessMapForTest().size()).isEqualTo(1);
+    assertThat(loadBalancer.getStickinessMapForTest()).hasSize(1);
   }
 
   @Test
@@ -506,7 +506,7 @@ public class RoundRobinLoadBalancerTest {
 
     verify(mockArgs, atLeast(4)).getHeaders();
     assertNotNull(loadBalancer.getStickinessMapForTest());
-    assertThat(loadBalancer.getStickinessMapForTest().size()).isEqualTo(2);
+    assertThat(loadBalancer.getStickinessMapForTest()).hasSize(2);
   }
 
   @Test
@@ -556,7 +556,7 @@ public class RoundRobinLoadBalancerTest {
 
     verify(mockArgs, atLeast(3)).getHeaders();
     assertNotNull(loadBalancer.getStickinessMapForTest());
-    assertThat(loadBalancer.getStickinessMapForTest().size()).isEqualTo(1);
+    assertThat(loadBalancer.getStickinessMapForTest()).hasSize(1);
   }
 
   @Test
@@ -610,7 +610,7 @@ public class RoundRobinLoadBalancerTest {
 
     verify(mockArgs, atLeast(3)).getHeaders();
     assertNotNull(loadBalancer.getStickinessMapForTest());
-    assertThat(loadBalancer.getStickinessMapForTest().size()).isEqualTo(2);
+    assertThat(loadBalancer.getStickinessMapForTest()).hasSize(2);
   }
 
   @Test
@@ -644,7 +644,7 @@ public class RoundRobinLoadBalancerTest {
     assertNull(loadBalancer.getStickinessMapForTest().get("my-sticky-value").value);
 
     assertEquals(sc2, picker.pickSubchannel(mockArgs).getSubchannel());
-    assertThat(loadBalancer.getStickinessMapForTest().size()).isEqualTo(1);
+    assertThat(loadBalancer.getStickinessMapForTest()).hasSize(1);
     verify(mockArgs, atLeast(2)).getHeaders();
   }
 
diff --git a/stub/src/main/java/io/grpc/stub/ClientCalls.java b/stub/src/main/java/io/grpc/stub/ClientCalls.java
index 2c34e0e689..8a8797a8d2 100644
--- a/stub/src/main/java/io/grpc/stub/ClientCalls.java
+++ b/stub/src/main/java/io/grpc/stub/ClientCalls.java
@@ -493,6 +493,7 @@ public final class ClientCalls {
       return super.setException(throwable);
     }
 
+    @SuppressWarnings("MissingOverride") // Add @Override once Java 6 support is dropped
     protected String pendingToString() {
       return MoreObjects.toStringHelper(this).add("clientCall", call).toString();
     }