diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/DiskType.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/DiskType.java
index ce57067786c4..0991a9d5d666 100644
--- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/DiskType.java
+++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/DiskType.java
@@ -32,7 +32,7 @@
  *
  * @see <a href="https://cloud.google.com/compute/docs/reference/latest/diskTypes">Disk Types</a>
  */
-public final class DiskType implements Serializable {
+public class DiskType implements Serializable {
 
   static final Function<com.google.api.services.compute.model.DiskType, DiskType> FROM_PB_FUNCTION =
       new Function<com.google.api.services.compute.model.DiskType, DiskType>() {
@@ -186,12 +186,12 @@ public String toString() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(diskTypeId);
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public final boolean equals(Object obj) {
     return obj instanceof DiskType && Objects.equals(toPb(), ((DiskType) obj).toPb());
   }
 
diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/License.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/License.java
index 2c6cb4ac9422..d69c78d0bbf4 100644
--- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/License.java
+++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/License.java
@@ -29,7 +29,7 @@
  *
  * @see <a href="https://cloud.google.com/compute/docs/reference/latest/licenses">Licenses</a>
  */
-public final class License implements Serializable {
+public class License implements Serializable {
 
   private static final long serialVersionUID = 6907923910319640363L;
 
@@ -65,12 +65,12 @@ public String toString() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(licenseId);
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public final boolean equals(Object obj) {
     return obj instanceof License && Objects.equals(toPb(), ((License) obj).toPb());
   }
 
diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/MachineType.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/MachineType.java
index ee242c0d1ef0..d9c446dddf72 100644
--- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/MachineType.java
+++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/MachineType.java
@@ -36,7 +36,7 @@
  *
  * @see <a href="https://cloud.google.com/compute/docs/machine-types">Machine Types</a>
  */
-public final class MachineType implements Serializable {
+public class MachineType implements Serializable {
 
   static final Function<com.google.api.services.compute.model.MachineType, MachineType>
       FROM_PB_FUNCTION =
@@ -242,12 +242,12 @@ public String toString() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(machineTypeId);
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public final boolean equals(Object obj) {
     return obj instanceof MachineType && Objects.equals(toPb(), ((MachineType) obj).toPb());
   }
 
diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Region.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Region.java
index 38f79a691721..470acf4e9061 100644
--- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Region.java
+++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Region.java
@@ -34,7 +34,7 @@
  *
  * @see <a href="https://cloud.google.com/compute/docs/zones">Region and Zones</a>
  */
-public final class Region implements Serializable {
+public class Region implements Serializable {
 
   static final Function<com.google.api.services.compute.model.Region, Region> FROM_PB_FUNCTION =
       new Function<com.google.api.services.compute.model.Region, Region>() {
@@ -306,12 +306,12 @@ public String toString() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(regionId);
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public final boolean equals(Object obj) {
     return obj instanceof Region && Objects.equals(toPb(), ((Region) obj).toPb());
   }
 
diff --git a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Zone.java b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Zone.java
index 20c64946d7ce..903f994118de 100644
--- a/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Zone.java
+++ b/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Zone.java
@@ -34,7 +34,7 @@
  *
  * @see <a href="https://cloud.google.com/compute/docs/zones">Region and Zones</a>
  */
-public final class Zone implements Serializable {
+public class Zone implements Serializable {
 
   static final Function<com.google.api.services.compute.model.Zone, Zone> FROM_PB_FUNCTION =
       new Function<com.google.api.services.compute.model.Zone, Zone>() {
@@ -325,12 +325,12 @@ public String toString() {
   }
 
   @Override
-  public int hashCode() {
+  public final int hashCode() {
     return Objects.hash(zoneId);
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public final boolean equals(Object obj) {
     return obj instanceof Zone && Objects.equals(toPb(), ((Zone) obj).toPb());
   }