diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryError.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryError.java
index e58f0d0b7213..8ec1e991786f 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryError.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryError.java
@@ -17,7 +17,7 @@
  * {@link BigQueryException} is thrown the BigQuery Error that caused it, if any, can be accessed
  * with {@link BigQueryException#error()}.
  */
-public class BigQueryError implements Serializable {
+public final class BigQueryError implements Serializable {
 
   static final Function<ErrorProto, BigQueryError> FROM_PB_FUNCTION =
       new Function<ErrorProto, BigQueryError>() {
@@ -98,7 +98,9 @@ public String toString() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof BigQueryError && Objects.equals(toPb(), ((BigQueryError) obj).toPb());
+    return obj == this
+        || obj instanceof BigQueryError
+        && Objects.equals(toPb(), ((BigQueryError) obj).toPb());
   }
 
   ErrorProto toPb() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
index 1ed0480eb006..e2718a6fc79b 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CopyJobConfiguration.java
@@ -181,8 +181,9 @@ ToStringHelper toStringHelper() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof CopyJobConfiguration
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(CopyJobConfiguration.class)
         && baseEquals((CopyJobConfiguration) obj);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
index 9576e7d75640..797407dd2e4a 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/CsvOptions.java
@@ -25,7 +25,7 @@
  * Google BigQuery options for CSV format. This class wraps some properties of CSV files used by
  * BigQuery to parse external data.
  */
-public class CsvOptions extends FormatOptions {
+public final class CsvOptions extends FormatOptions {
 
   private static final long serialVersionUID = 2193570529308612708L;
 
@@ -224,7 +224,9 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof CsvOptions && Objects.equals(toPb(), ((CsvOptions) obj).toPb());
+    return obj == this
+        || obj instanceof CsvOptions
+        && Objects.equals(toPb(), ((CsvOptions) obj).toPb());
   }
 
   com.google.api.services.bigquery.model.CsvOptions toPb() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
index b850f5e23069..879719fde6d8 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Dataset.java
@@ -231,10 +231,15 @@ public Builder toBuilder() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof Dataset
-        && Objects.equals(toPb(), ((Dataset) obj).toPb())
-        && Objects.equals(options, ((Dataset) obj).options);
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(Dataset.class)) {
+      return false;
+    }
+    Dataset other = (Dataset) obj;
+    return Objects.equals(toPb(), other.toPb())
+        && Objects.equals(options, other.options);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
index 006c089f8d63..19a674e7a079 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetId.java
@@ -26,7 +26,7 @@
 /**
  * Google BigQuery Dataset identity.
  */
-public class DatasetId implements Serializable {
+public final class DatasetId implements Serializable {
 
   private static final long serialVersionUID = -6186254820908152300L;
 
@@ -68,7 +68,9 @@ public static DatasetId of(String dataset) {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof DatasetId && Objects.equals(toPb(), ((DatasetId) obj).toPb());
+    return obj == this
+        || obj instanceof DatasetId
+        && Objects.equals(toPb(), ((DatasetId) obj).toPb());
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
index 9f1d25f05925..612006d520cd 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/DatasetInfo.java
@@ -395,7 +395,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj != null
+    return obj == this
+        || obj != null
         && obj.getClass().equals(DatasetInfo.class)
         && Objects.equals(toPb(), ((DatasetInfo) obj).toPb());
   }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableDefinition.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableDefinition.java
index e593e4d9b62e..c0efe7357cc5 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableDefinition.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableDefinition.java
@@ -256,8 +256,9 @@ ToStringHelper toStringHelper() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof ExternalTableDefinition
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(ExternalTableDefinition.class)
         && baseEquals((ExternalTableDefinition) obj);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
index f8eb14d643c1..96cee1899a6b 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExtractJobConfiguration.java
@@ -211,8 +211,9 @@ ToStringHelper toStringHelper() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof ExtractJobConfiguration
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(ExtractJobConfiguration.class)
         && baseEquals((ExtractJobConfiguration) obj);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
index 55fae44c5eed..38a828ba1caf 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Field.java
@@ -32,12 +32,12 @@
 import java.util.Objects;
 
 /**
- * Google BigQuery Table field. A table field has a name, a value, a mode and possibly a
- * description. Supported types are: {@link Type#integer()}, {@link Type#bool()},
- * {@link Type#string()}, {@link Type#floatingPoint()}, {@link Type#timestamp()} and
- * {@link Type#record(Field...)}. One or more fields form a table's schema.
+ * Google BigQuery Table field. A table field has a name, a type, a mode and possibly a description.
+ * Supported types are: {@link Type#integer()}, {@link Type#bool()}, {@link Type#string()},
+ * {@link Type#floatingPoint()}, {@link Type#timestamp()} and {@link Type#record(Field...)}. One or
+ * more fields form a table's schema.
  */
-public class Field implements Serializable {
+public final class Field implements Serializable {
 
   static final Function<TableFieldSchema, Field> FROM_PB_FUNCTION =
       new Function<TableFieldSchema, Field>() {
@@ -56,6 +56,11 @@ public TableFieldSchema apply(Field field) {
 
   private static final long serialVersionUID = -8154262932305199256L;
 
+  private final String name;
+  private final Type type;
+  private final String mode;
+  private final String description;
+
   /**
    * Data Types for a BigQuery Table field. This class provides factory methods for all BigQuery
    * field types. To instantiate a RECORD value the list of sub-fields must be provided.
@@ -185,11 +190,6 @@ public enum Mode {
     NULLABLE, REQUIRED, REPEATED
   }
 
-  private final String name;
-  private final Type type;
-  private final String mode;
-  private final String description;
-
   public static final class Builder {
 
     private String name;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
index 8b27c70db782..aeea237dea19 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FieldValue.java
@@ -216,13 +216,16 @@ public String toString() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(attribute, value);
   }
 
   @Override
-  public boolean equals(Object obj) {
-    if (!(obj instanceof FieldValue)) {
+  public final boolean equals(Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(FieldValue.class)) {
       return false;
     }
     FieldValue other = (FieldValue) obj;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java
index f46e7b40f4c1..213fe16c4e0e 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/FormatOptions.java
@@ -59,7 +59,10 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof FormatOptions && Objects.equals(type, ((FormatOptions) obj).type());
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(FormatOptions.class)
+        && Objects.equals(type, ((FormatOptions) obj).type());
   }
 
   /**
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
index f0d61583f83f..9a38c0c99f10 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllRequest.java
@@ -37,7 +37,7 @@
  * @see <a href="https://cloud.google.com/bigquery/streaming-data-into-bigquery">Streaming Data into
  *     BigQuery</a>
  */
-public class InsertAllRequest implements Serializable {
+public final class InsertAllRequest implements Serializable {
 
   private static final long serialVersionUID = 211200307773853078L;
 
@@ -443,6 +443,9 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
+    if (obj == this) {
+      return true;
+    }
     if (!(obj instanceof InsertAllRequest)) {
       return false;
     }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
index 992c5d851bbc..58f63daea0d5 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/InsertAllResponse.java
@@ -74,13 +74,15 @@ public boolean hasErrors() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(insertErrors);
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof InsertAllResponse
+  public final boolean equals(Object obj) {
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(InsertAllResponse.class)
         && Objects.equals(insertErrors, ((InsertAllResponse) obj).insertErrors);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
index e12531543513..efe48501a279 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Job.java
@@ -179,10 +179,15 @@ public Builder toBuilder() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof Job
-        && Objects.equals(toPb(), ((Job) obj).toPb())
-        && Objects.equals(options, ((Job) obj).options);
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(Job.class)) {
+      return false;
+    }
+    Job other = (Job) obj;
+    return Objects.equals(toPb(), other.toPb())
+        && Objects.equals(options, other.options);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobId.java
index 898c894f9a21..bfcfeeef65c7 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobId.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobId.java
@@ -26,7 +26,7 @@
 /**
  * Google BigQuery Job identity.
  */
-public class JobId implements Serializable {
+public final class JobId implements Serializable {
 
   private static final long serialVersionUID = 1225914835379688976L;
 
@@ -68,7 +68,9 @@ public static JobId of(String job) {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof JobId && Objects.equals(toPb(), ((JobId) obj).toPb());
+    return obj == this
+        || obj instanceof JobId
+        && Objects.equals(toPb(), ((JobId) obj).toPb());
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
index b15ba38f8912..158008b72db1 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobInfo.java
@@ -319,7 +319,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj != null
+    return obj == this
+        || obj != null
         && obj.getClass().equals(JobInfo.class)
         && Objects.equals(toPb(), ((JobInfo) obj).toPb());
   }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
index 34e4917921ba..dd4571e794c0 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatistics.java
@@ -14,7 +14,7 @@
 /**
  * A Google BigQuery Job statistics.
  */
-public class JobStatistics implements Serializable {
+public abstract class JobStatistics implements Serializable {
 
   private static final long serialVersionUID = 1433024714741660399L;
 
@@ -22,6 +22,55 @@ public class JobStatistics implements Serializable {
   private final Long endTime;
   private final Long startTime;
 
+  /**
+   * A Google BigQuery Copy Job statistics.
+   */
+  public static class CopyStatistics extends JobStatistics {
+
+    private static final long serialVersionUID = 8218325588441660938L;
+
+    static final class Builder extends JobStatistics.Builder<CopyStatistics, Builder> {
+
+      private Builder() {}
+
+      private Builder(com.google.api.services.bigquery.model.JobStatistics statisticsPb) {
+        super(statisticsPb);
+      }
+
+      @Override
+      CopyStatistics build() {
+        return new CopyStatistics(this);
+      }
+    }
+
+    private CopyStatistics(Builder builder) {
+      super(builder);
+    }
+
+    @Override
+    public final boolean equals(Object obj) {
+      return obj == this
+          || obj != null
+          && obj.getClass().equals(CopyStatistics.class)
+          && baseEquals((CopyStatistics) obj);
+    }
+
+    @Override
+    public final int hashCode() {
+      return baseHashCode();
+    }
+
+    static Builder builder() {
+      return new Builder();
+    }
+
+    @SuppressWarnings("unchecked")
+    static CopyStatistics fromPb(
+        com.google.api.services.bigquery.model.JobStatistics statisticPb) {
+      return new Builder(statisticPb).build();
+    }
+  }
+
   /**
    * A Google BigQuery Extract Job statistics.
    */
@@ -73,14 +122,16 @@ ToStringHelper toStringHelper() {
     }
 
     @Override
-    public boolean equals(Object obj) {
-      return obj instanceof ExtractStatistics
-          && Objects.equals(toPb(), ((ExtractStatistics) obj).toPb());
+    public final boolean equals(Object obj) {
+      return obj == this
+          || obj != null
+          && obj.getClass().equals(ExtractStatistics.class)
+          && baseEquals((ExtractStatistics) obj);
     }
 
     @Override
-    public int hashCode() {
-      return Objects.hash(super.hashCode(), destinationUriFileCounts);
+    public final int hashCode() {
+      return Objects.hash(baseHashCode(), destinationUriFileCounts);
     }
 
     @Override
@@ -203,13 +254,16 @@ ToStringHelper toStringHelper() {
     }
 
     @Override
-    public boolean equals(Object obj) {
-      return obj instanceof LoadStatistics && Objects.equals(toPb(), ((LoadStatistics) obj).toPb());
+    public final boolean equals(Object obj) {
+      return obj == this
+          || obj != null
+          && obj.getClass().equals(LoadStatistics.class)
+          && baseEquals((LoadStatistics) obj);
     }
 
     @Override
-    public int hashCode() {
-      return Objects.hash(super.hashCode(), inputBytes, inputFiles, outputBytes, outputRows);
+    public final int hashCode() {
+      return Objects.hash(baseHashCode(), inputBytes, inputFiles, outputBytes, outputRows);
     }
 
     @Override
@@ -361,14 +415,16 @@ ToStringHelper toStringHelper() {
     }
 
     @Override
-    public boolean equals(Object obj) {
-      return obj instanceof QueryStatistics
-          && Objects.equals(toPb(), ((QueryStatistics) obj).toPb());
+    public final boolean equals(Object obj) {
+      return obj == this
+          || obj != null
+          && obj.getClass().equals(QueryStatistics.class)
+          && baseEquals((QueryStatistics) obj);
     }
 
     @Override
-    public int hashCode() {
-      return Objects.hash(super.hashCode(), billingTier, cacheHit, totalBytesBilled,
+    public final int hashCode() {
+      return Objects.hash(baseHashCode(), billingTier, cacheHit, totalBytesBilled,
           totalBytesProcessed, queryPlan);
     }
 
@@ -396,7 +452,7 @@ static QueryStatistics fromPb(
     }
   }
 
-  static class Builder<T extends JobStatistics, B extends Builder<T, B>> {
+  abstract static class Builder<T extends JobStatistics, B extends Builder<T, B>> {
 
     private Long creationTime;
     private Long endTime;
@@ -430,10 +486,7 @@ B startTime(Long startTime) {
       return self();
     }
 
-    @SuppressWarnings("unchecked")
-    T build() {
-      return (T) new JobStatistics(this);
-    }
+    abstract T build();
   }
 
   protected JobStatistics(Builder builder) {
@@ -477,14 +530,12 @@ public String toString() {
     return toStringHelper().toString();
   }
 
-  @Override
-  public int hashCode() {
+  final int baseHashCode() {
     return Objects.hash(creationTime, endTime, startTime);
   }
 
-  @Override
-  public boolean equals(Object obj) {
-    return obj instanceof JobStatistics && Objects.equals(toPb(), ((JobStatistics) obj).toPb());
+  final boolean baseEquals(JobStatistics jobStatistics) {
+    return Objects.equals(toPb(), jobStatistics.toPb());
   }
 
   com.google.api.services.bigquery.model.JobStatistics toPb() {
@@ -496,10 +547,6 @@ com.google.api.services.bigquery.model.JobStatistics toPb() {
     return statistics;
   }
 
-  static Builder builder() {
-    return new Builder();
-  }
-
   @SuppressWarnings("unchecked")
   static <T extends JobStatistics> T fromPb(
       com.google.api.services.bigquery.model.JobStatistics statisticPb) {
@@ -510,7 +557,7 @@ static <T extends JobStatistics> T fromPb(
     } else if (statisticPb.getQuery() != null) {
       return (T) QueryStatistics.fromPb(statisticPb);
     } else {
-      return (T) new Builder(statisticPb).build();
+      return (T) CopyStatistics.fromPb(statisticPb);
     }
   }
 }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatus.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatus.java
index 738a644a5dde..d28014282336 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatus.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/JobStatus.java
@@ -94,13 +94,16 @@ public String toString() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(state, error, executionErrors);
   }
 
   @Override
-  public boolean equals(Object obj) {
-    return obj instanceof JobStatus && Objects.equals(toPb(), ((JobStatus) obj).toPb());
+  public final boolean equals(Object obj) {
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(JobStatus.class)
+        && Objects.equals(toPb(), ((JobStatus) obj).toPb());
   }
 
   com.google.api.services.bigquery.model.JobStatus toPb() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
index cc1f25ae886a..025d1a83982e 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/LoadJobConfiguration.java
@@ -269,8 +269,9 @@ ToStringHelper toStringHelper() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof LoadJobConfiguration
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(LoadJobConfiguration.class)
         && baseEquals((LoadJobConfiguration) obj);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
index bb942d09ed6f..1b1594f667a6 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryJobConfiguration.java
@@ -450,8 +450,9 @@ ToStringHelper toStringHelper() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof QueryJobConfiguration
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(QueryJobConfiguration.class)
         && baseEquals((QueryJobConfiguration) obj);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
index b3522a2a6ba3..f9aad787f149 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryRequest.java
@@ -60,7 +60,7 @@
  * @see <a href="https://cloud.google.com/bigquery/docs/reference/v2/jobs/query">Query</a>
  * @see <a href="https://cloud.google.com/bigquery/query-reference">Query Reference</a>
  */
-public class QueryRequest implements Serializable {
+public final class QueryRequest implements Serializable {
 
   private static final long serialVersionUID = -8727328332415880852L;
 
@@ -250,7 +250,9 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof QueryRequest && Objects.equals(toPb(), ((QueryRequest) obj).toPb());
+    return obj == this
+        || obj instanceof QueryRequest
+        && Objects.equals(toPb(), ((QueryRequest) obj).toPb());
   }
 
   QueryRequest setProjectId(String projectId) {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
index 12000cc1cbd2..7fc04170a531 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResponse.java
@@ -170,16 +170,16 @@ public String toString() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(jobId);
   }
 
   @Override
-  public boolean equals(Object obj) {
-    if (this == obj) {
+  public final boolean equals(Object obj) {
+    if (obj == this) {
       return true;
     }
-    if (obj == null || getClass() != obj.getClass()) {
+    if (obj == null || !obj.getClass().equals(QueryResponse.class)) {
       return false;
     }
     QueryResponse response = (QueryResponse) obj;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResult.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResult.java
index 692abab937a9..e1b685ec6404 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResult.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryResult.java
@@ -149,16 +149,16 @@ public String toString() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(super.hashCode(), cacheHit, schema, totalBytesProcessed, totalRows);
   }
 
   @Override
-  public boolean equals(Object obj) {
-    if (this == obj) {
+  public final boolean equals(Object obj) {
+    if (obj == this) {
       return true;
     }
-    if (obj == null || getClass() != obj.getClass()) {
+    if (obj == null || !obj.getClass().equals(QueryResult.class)) {
       return false;
     }
     QueryResult response = (QueryResult) obj;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java
index 18ede667bb45..baf61fd6291c 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/QueryStage.java
@@ -372,15 +372,18 @@ public String toString() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(computeRatioAvg, computeRatioMax, generatedId, name, readRatioAvg,
         readRatioMax, recordsRead, recordsWritten, steps, waitRatioAvg, waitRatioMax,
         writeRatioAvg);
   }
 
   @Override
-  public boolean equals(Object obj) {
-    if (!(obj instanceof QueryStage)) {
+  public final boolean equals(Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(QueryStage.class)) {
       return false;
     }
     QueryStage other = (QueryStage) obj;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java
index 787bb0d7f35f..54a48e73a0a7 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Schema.java
@@ -31,7 +31,7 @@
 /**
  * This class represents the schema for a Google BigQuery Table or data source.
  */
-public class Schema implements Serializable {
+public final class Schema implements Serializable {
 
   static final Function<com.google.api.services.bigquery.model.TableSchema, Schema>
       FROM_PB_FUNCTION = new Function<com.google.api.services.bigquery.model.TableSchema,
@@ -128,7 +128,9 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof Schema && Objects.equals(toPb(), ((Schema) obj).toPb());
+    return obj == this
+        || obj instanceof Schema
+        && Objects.equals(toPb(), ((Schema) obj).toPb());
   }
 
   com.google.api.services.bigquery.model.TableSchema toPb() {
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/StandardTableDefinition.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/StandardTableDefinition.java
index 133c104e7a47..934c555515da 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/StandardTableDefinition.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/StandardTableDefinition.java
@@ -253,8 +253,9 @@ ToStringHelper toStringHelper() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof StandardTableDefinition
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(StandardTableDefinition.class)
         && baseEquals((StandardTableDefinition) obj);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
index 22082ff63ea7..26997f843772 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/Table.java
@@ -323,10 +323,15 @@ public Builder toBuilder() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof Table
-        && Objects.equals(toPb(), ((Table) obj).toPb())
-        && Objects.equals(options, ((Table) obj).options);
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(Table.class)) {
+      return false;
+    }
+    Table other = (Table) obj;
+    return Objects.equals(toPb(), other.toPb())
+        && Objects.equals(options, other.options);
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
index 20ed53cc1a5d..da6d4b614c42 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableId.java
@@ -27,7 +27,7 @@
 /**
  * Google BigQuery Table identity.
  */
-public class TableId implements Serializable {
+public final class TableId implements Serializable {
 
   static final Function<TableReference, TableId> FROM_PB_FUNCTION =
       new Function<TableReference, TableId>() {
@@ -92,7 +92,9 @@ public static TableId of(String dataset, String table) {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof TableId && Objects.equals(toPb(), ((TableId) obj).toPb());
+    return obj == this
+        || obj instanceof TableId
+        && Objects.equals(toPb(), ((TableId) obj).toPb());
   }
 
   @Override
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
index 938907e245e7..384ed1920d29 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -339,7 +339,8 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj != null
+    return obj == this
+        || obj != null
         && obj.getClass().equals(TableInfo.class)
         && Objects.equals(toPb(), ((TableInfo) obj).toPb());
   }
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewDefinition.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewDefinition.java
index ca9b2a60113d..96e386081366 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewDefinition.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewDefinition.java
@@ -147,8 +147,9 @@ ToStringHelper toStringHelper() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof ViewDefinition
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(ViewDefinition.class)
         && baseEquals((ViewDefinition) obj);
   }
 
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java
index 6cc44ce7d5d6..ea57c4dbd800 100644
--- a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/WriteChannelConfiguration.java
@@ -33,7 +33,7 @@
  * into a table with a {@link com.google.gcloud.WriteChannel}
  * ({@link BigQuery#writer(WriteChannelConfiguration)}).
  */
-public class WriteChannelConfiguration implements LoadConfiguration, Serializable {
+public final class WriteChannelConfiguration implements LoadConfiguration, Serializable {
 
   private static final long serialVersionUID = 470267591917413578L;
 
@@ -241,7 +241,8 @@ public String toString() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof WriteChannelConfiguration
+    return obj == this
+        || obj instanceof WriteChannelConfiguration
         && Objects.equals(toPb(), ((WriteChannelConfiguration) obj).toPb());
   }
 
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
index 9c90fbe7b05f..4a08dc95daee 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobInfoTest.java
@@ -25,6 +25,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.gcloud.bigquery.JobInfo.CreateDisposition;
 import com.google.gcloud.bigquery.JobInfo.WriteDisposition;
+import com.google.gcloud.bigquery.JobStatistics.CopyStatistics;
 import com.google.gcloud.bigquery.JobStatistics.ExtractStatistics;
 import com.google.gcloud.bigquery.JobStatistics.LoadStatistics;
 import com.google.gcloud.bigquery.JobStatistics.QueryStatistics;
@@ -42,7 +43,7 @@ public class JobInfoTest {
   private static final String EMAIL = "email";
   private static final JobId JOB_ID = JobId.of("job");
   private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE);
-  private static final JobStatistics COPY_JOB_STATISTICS = JobStatistics.builder()
+  private static final CopyStatistics COPY_JOB_STATISTICS = CopyStatistics.builder()
       .creationTime(1L)
       .endTime(3L)
       .startTime(2L)
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatisticsTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatisticsTest.java
index 4a3940ba4543..7562129de058 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatisticsTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobStatisticsTest.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertEquals;
 
 import com.google.common.collect.ImmutableList;
+import com.google.gcloud.bigquery.JobStatistics.CopyStatistics;
 import com.google.gcloud.bigquery.JobStatistics.ExtractStatistics;
 import com.google.gcloud.bigquery.JobStatistics.LoadStatistics;
 import com.google.gcloud.bigquery.JobStatistics.QueryStatistics;
@@ -42,6 +43,11 @@ public class JobStatisticsTest {
   private static final Long CREATION_TIME = 10L;
   private static final Long END_TIME = 20L;
   private static final Long START_TIME = 15L;
+  private static final CopyStatistics COPY_STATISTICS = CopyStatistics.builder()
+      .creationTime(CREATION_TIME)
+      .endTime(END_TIME)
+      .startTime(START_TIME)
+      .build();
   private static final ExtractStatistics EXTRACT_STATISTICS = ExtractStatistics.builder()
       .creationTime(CREATION_TIME)
       .endTime(END_TIME)
@@ -101,17 +107,12 @@ public class JobStatisticsTest {
       .billingTier(BILLING_TIER)
       .cacheHit(CACHE_HIT)
       .build();
-  private static final JobStatistics STATISTICS = JobStatistics.builder()
-      .creationTime(CREATION_TIME)
-      .endTime(END_TIME)
-      .startTime(START_TIME)
-      .build();
 
   @Test
   public void testBuilder() {
-    assertEquals(CREATION_TIME, STATISTICS.creationTime());
-    assertEquals(START_TIME, STATISTICS.startTime());
-    assertEquals(END_TIME, STATISTICS.endTime());
+    assertEquals(CREATION_TIME, COPY_STATISTICS.creationTime());
+    assertEquals(START_TIME, COPY_STATISTICS.startTime());
+    assertEquals(END_TIME, COPY_STATISTICS.endTime());
 
     assertEquals(CREATION_TIME, EXTRACT_STATISTICS.creationTime());
     assertEquals(START_TIME, EXTRACT_STATISTICS.startTime());
@@ -160,7 +161,7 @@ public void testToPbAndFromPb() {
         ExtractStatistics.fromPb(EXTRACT_STATISTICS.toPb()));
     compareLoadStatistics(LOAD_STATISTICS, LoadStatistics.fromPb(LOAD_STATISTICS.toPb()));
     compareQueryStatistics(QUERY_STATISTICS, QueryStatistics.fromPb(QUERY_STATISTICS.toPb()));
-    compareStatistics(STATISTICS, JobStatistics.fromPb(STATISTICS.toPb()));
+    compareStatistics(COPY_STATISTICS, JobStatistics.fromPb(COPY_STATISTICS.toPb()));
 
     compareLoadStatistics(LOAD_STATISTICS_INCOMPLETE,
         LoadStatistics.fromPb(LOAD_STATISTICS_INCOMPLETE.toPb()));
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
index 61c9c521196a..381b88045725 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/JobTest.java
@@ -27,6 +27,8 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
+import com.google.gcloud.bigquery.JobStatistics.CopyStatistics;
+
 import org.junit.After;
 import org.junit.Test;
 
@@ -40,7 +42,7 @@ public class JobTest {
   private static final String SELF_LINK = "selfLink";
   private static final String EMAIL = "email";
   private static final JobStatus JOB_STATUS = new JobStatus(JobStatus.State.DONE);
-  private static final JobStatistics COPY_JOB_STATISTICS = JobStatistics.builder()
+  private static final JobStatistics COPY_JOB_STATISTICS = CopyStatistics.builder()
       .creationTime(1L)
       .endTime(3L)
       .startTime(2L)
diff --git a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
index 61e763f9a539..231e7da8ab59 100644
--- a/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
+++ b/gcloud-java-bigquery/src/test/java/com/google/gcloud/bigquery/SerializationTest.java
@@ -122,11 +122,12 @@ public class SerializationTest extends BaseSerializationTest {
           .etag(ETAG)
           .generatedId(GENERATED_ID)
           .build();
-  private static final JobStatistics JOB_STATISTICS = JobStatistics.builder()
-      .creationTime(1L)
-      .endTime(3L)
-      .startTime(2L)
-      .build();
+  private static final JobStatistics.CopyStatistics COPY_STATISTICS =
+      JobStatistics.CopyStatistics.builder()
+          .creationTime(1L)
+          .endTime(3L)
+          .startTime(2L)
+          .build();
   private static final JobStatistics.ExtractStatistics EXTRACT_STATISTICS =
       JobStatistics.ExtractStatistics.builder()
           .creationTime(1L)
@@ -235,7 +236,7 @@ protected Serializable[] serializableObjects() {
     return new Serializable[]{DOMAIN_ACCESS, GROUP_ACCESS, USER_ACCESS, VIEW_ACCESS, DATASET_ID,
         DATASET_INFO, TABLE_ID, CSV_OPTIONS, STREAMING_BUFFER, TABLE_DEFINITION,
         EXTERNAL_TABLE_DEFINITION, VIEW_DEFINITION, TABLE_SCHEMA, TABLE_INFO, VIEW_INFO,
-        EXTERNAL_TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION, JOB_STATISTICS, EXTRACT_STATISTICS,
+        EXTERNAL_TABLE_INFO, INLINE_FUNCTION, URI_FUNCTION, COPY_STATISTICS, EXTRACT_STATISTICS,
         LOAD_STATISTICS, QUERY_STATISTICS, BIGQUERY_ERROR, JOB_STATUS, JOB_ID,
         COPY_JOB_CONFIGURATION, EXTRACT_JOB_CONFIGURATION, LOAD_CONFIGURATION,
         LOAD_JOB_CONFIGURATION, QUERY_JOB_CONFIGURATION, JOB_INFO, INSERT_ALL_REQUEST,
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/IamPolicy.java b/gcloud-java-core/src/main/java/com/google/gcloud/IamPolicy.java
index 9cce4b23c864..3e54e8ebc4d8 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/IamPolicy.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/IamPolicy.java
@@ -219,7 +219,10 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    if (obj == null || !getClass().equals(obj.getClass())) {
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(getClass())) {
       return false;
     }
     @SuppressWarnings("rawtypes")
diff --git a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequest.java b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequest.java
index 7f1fba4688ab..f4f3d4405fda 100644
--- a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequest.java
+++ b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequest.java
@@ -193,17 +193,16 @@ public Builder toBuilder() {
 
   @Override
   public final boolean equals(Object obj) {
-    if (this == obj) {
+    if (obj == this) {
       return true;
     }
     if (obj == null || !obj.getClass().equals(ChangeRequest.class)) {
       return false;
-    } else {
-      ChangeRequest other = (ChangeRequest) obj;
-      return Objects.equals(options, other.options)
-          && Objects.equals(zone, other.zone)
-          && Objects.equals(toPb(), other.toPb());
     }
+    ChangeRequest other = (ChangeRequest) obj;
+    return Objects.equals(toPb(), other.toPb())
+        && Objects.equals(options, other.options)
+        && Objects.equals(zone, other.zone);
   }
 
   @Override
diff --git a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequestInfo.java b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequestInfo.java
index 4a92512996dd..808c66670e8c 100644
--- a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequestInfo.java
+++ b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ChangeRequestInfo.java
@@ -335,9 +335,11 @@ static ChangeRequestInfo fromPb(Change pb) {
   }
 
   @Override
-  public boolean equals(Object other) {
-    return other != null && other.getClass().equals(ChangeRequestInfo.class)
-        && other instanceof ChangeRequestInfo && toPb().equals(((ChangeRequestInfo) other).toPb());
+  public boolean equals(Object obj) {
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(ChangeRequestInfo.class)
+        && toPb().equals(((ChangeRequestInfo) obj).toPb());
   }
 
   @Override
diff --git a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ProjectInfo.java b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ProjectInfo.java
index 52edb25ec902..884a9cba4984 100644
--- a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ProjectInfo.java
+++ b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ProjectInfo.java
@@ -268,12 +268,15 @@ static ProjectInfo fromPb(Project pb) {
   }
 
   @Override
-  public boolean equals(Object other) {
-    return (other instanceof ProjectInfo) && toPb().equals(((ProjectInfo) other).toPb());
+  public final boolean equals(Object obj) {
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(ProjectInfo.class)
+        && toPb().equals(((ProjectInfo) obj).toPb());
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(id, number, quota);
   }
 
diff --git a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/RecordSet.java b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/RecordSet.java
index c1a292dc2833..187379e2eeb5 100644
--- a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/RecordSet.java
+++ b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/RecordSet.java
@@ -43,7 +43,7 @@
  * @see <a href="https://cloud.google.com/dns/api/v1/resourceRecordSets">Google Cloud DNS
  * documentation</a>
  */
-public class RecordSet implements Serializable {
+public final class RecordSet implements Serializable {
 
   static final Function<ResourceRecordSet, RecordSet> FROM_PB_FUNCTION =
       new Function<ResourceRecordSet, RecordSet>() {
@@ -282,7 +282,7 @@ public final int hashCode() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
+    return obj == this
         || obj instanceof RecordSet
         && Objects.equals(this.toPb(), ((RecordSet) obj).toPb());
   }
diff --git a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/Zone.java b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/Zone.java
index b79d2c721398..ae1761dd7758 100644
--- a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/Zone.java
+++ b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/Zone.java
@@ -197,10 +197,15 @@ public Dns dns() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof Zone
-        && Objects.equals(toPb(), ((Zone) obj).toPb())
-        && Objects.equals(options, ((Zone) obj).options);
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(Zone.class)) {
+      return false;
+    }
+    Zone other = (Zone) obj;
+    return Objects.equals(toPb(), other.toPb())
+        && Objects.equals(options, other.options);
   }
 
   @Override
diff --git a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ZoneInfo.java b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ZoneInfo.java
index 03c23a6ce3d3..4c85383365cd 100644
--- a/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ZoneInfo.java
+++ b/gcloud-java-dns/src/main/java/com/google/gcloud/dns/ZoneInfo.java
@@ -293,7 +293,9 @@ static ZoneInfo fromPb(ManagedZone pb) {
 
   @Override
   public boolean equals(Object obj) {
-    return obj != null && obj.getClass().equals(ZoneInfo.class)
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(ZoneInfo.class)
         && Objects.equals(toPb(), ((ZoneInfo) obj).toPb());
   }
 
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java
index 219d74262319..6f15ac217dc5 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Policy.java
@@ -40,7 +40,7 @@
  *
  * @see <a href="https://cloud.google.com/iam/reference/rest/v1/Policy">Policy</a>
  */
-public class Policy extends IamPolicy<String> {
+public final class Policy extends IamPolicy<String> {
 
   private static final long serialVersionUID = -5573557282693961850L;
 
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
index 881cbf7cd37e..08bbd6f6346c 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/Project.java
@@ -258,10 +258,15 @@ public Builder toBuilder() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof Project
-        && Objects.equals(toPb(), ((Project) obj).toPb())
-        && Objects.equals(options, ((Project) obj).options);
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(Project.class)) {
+      return false;
+    }
+    Project other = (Project) obj;
+    return Objects.equals(toPb(), other.toPb())
+        && Objects.equals(options, other.options);
   }
 
   @Override
diff --git a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
index 260e8a8e2f26..5ba8079a32a7 100644
--- a/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
+++ b/gcloud-java-resourcemanager/src/main/java/com/google/gcloud/resourcemanager/ProjectInfo.java
@@ -336,7 +336,9 @@ public Long createTimeMillis() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj != null && obj.getClass().equals(ProjectInfo.class)
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(ProjectInfo.class)
         && Objects.equals(toPb(), ((ProjectInfo) obj).toPb());
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchResponse.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchResponse.java
index fe5f6f5743c8..f18ee5753162 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchResponse.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BatchResponse.java
@@ -121,13 +121,16 @@ static <T extends Serializable> Result<T> empty() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(deleteResult, updateResult, getResult);
   }
 
   @Override
-  public boolean equals(Object obj) {
-    if (!(obj instanceof BatchResponse)) {
+  public final boolean equals(Object obj) {
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(BatchResponse.class)) {
       return false;
     }
     BatchResponse other = (BatchResponse) obj;
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
index 72fcfeff034f..4097981463fb 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java
@@ -526,10 +526,15 @@ public Builder toBuilder() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof Blob
-        && Objects.equals(toPb(), ((Blob) obj).toPb())
-        && Objects.equals(options, ((Blob) obj).options);
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(Blob.class)) {
+      return false;
+    }
+    Blob other = (Blob) obj;
+    return Objects.equals(toPb(), other.toPb())
+        && Objects.equals(options, other.options);
   }
 
   @Override
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java
index d30003d632db..784d13f20f68 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobId.java
@@ -79,9 +79,16 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj instanceof BlobId && Objects.equals(bucket, ((BlobId) obj).bucket)
-        && Objects.equals(name, ((BlobId) obj).name)
-        && Objects.equals(generation, ((BlobId) obj).generation);
+    if (obj == this) {
+      return true;
+    }
+    if (obj == null || !obj.getClass().equals(BlobId.class)) {
+      return false;
+    }
+    BlobId other = (BlobId) obj;
+    return Objects.equals(bucket, other.bucket)
+        && Objects.equals(name, other.name)
+        && Objects.equals(generation, other.generation);
   }
 
   StorageObject toPb() {
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
index 42a2e282b002..0376f1ccae92 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BlobInfo.java
@@ -638,7 +638,9 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj != null && obj.getClass().equals(BlobInfo.class)
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(BlobInfo.class)
         && Objects.equals(toPb(), ((BlobInfo) obj).toPb());
   }
 
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
index 13bbd4f197eb..d8007a46f8db 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Bucket.java
@@ -715,10 +715,15 @@ public Builder toBuilder() {
 
   @Override
   public final boolean equals(Object obj) {
-    return this == obj
-        || obj instanceof Bucket
-        && Objects.equals(toPb(), ((Bucket) obj).toPb())
-        && Objects.equals(options, ((Bucket) obj).options);
+    if (obj == this) {
+      return true;
+    }
+    if (obj != null && !obj.getClass().equals(Bucket.class)) {
+      return false;
+    }
+    Bucket other = (Bucket) obj;
+    return Objects.equals(toPb(), other.toPb())
+        && Objects.equals(options, other.options);
   }
 
   @Override
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
index a893e45c5c86..33f5caf40b84 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
@@ -719,7 +719,9 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object obj) {
-    return obj != null && obj.getClass().equals(BucketInfo.class)
+    return obj == this
+        || obj != null
+        && obj.getClass().equals(BucketInfo.class)
         && Objects.equals(toPb(), ((BucketInfo) obj).toPb());
   }