diff --git a/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
index f478bb09ae63..d75cb81f8165 100644
--- a/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
+++ b/google-cloud-clients/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java
@@ -663,7 +663,7 @@ public String toString() {
             .toString();
       }
 
-      StorageClass getStorageClass() {
+      public StorageClass getStorageClass() {
         return storageClass;
       }
     }
@@ -1249,7 +1249,7 @@ public Builder setLabels(Map<String, String> labels) {
                   @Override
                   public String apply(String input) {
                     // replace null values with empty strings
-                    return input == null ? Data.<String>nullOf(String.class) : input;
+                    return input == null ? Data.nullOf(String.class) : input;
                   }
                 });
       }
@@ -1259,7 +1259,7 @@ public String apply(String input) {
     @Override
     public Builder setDefaultKmsKeyName(String defaultKmsKeyName) {
       this.defaultKmsKeyName =
-          defaultKmsKeyName != null ? defaultKmsKeyName : Data.<String>nullOf(String.class);
+          defaultKmsKeyName != null ? defaultKmsKeyName : Data.nullOf(String.class);
       return this;
     }
 
@@ -1727,8 +1727,7 @@ public Rule apply(LifecycleRule lifecycleRule) {
     }
     if (retentionPeriod != null) {
       if (Data.isNull(retentionPeriod)) {
-        bucketPb.setRetentionPolicy(
-            Data.<Bucket.RetentionPolicy>nullOf(Bucket.RetentionPolicy.class));
+        bucketPb.setRetentionPolicy(Data.nullOf(Bucket.RetentionPolicy.class));
       } else {
         Bucket.RetentionPolicy retentionPolicy = new Bucket.RetentionPolicy();
         retentionPolicy.setRetentionPeriod(retentionPeriod);