diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Settings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Settings.java
index 4bf24aa9c5d2..08a31bafc375 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Settings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Settings.java
@@ -554,13 +554,13 @@ private static Builder createDefault() {
       builder
           .writeLogEntriesSettings()
           .getBundlingSettingsBuilder()
-          .setElementCountThreshold(100)
-          .setRequestByteThreshold(20480)
-          .setDelayThreshold(Duration.millis(10))
+          .setElementCountThreshold(1000)
+          .setRequestByteThreshold(1048576)
+          .setDelayThreshold(Duration.millis(50))
           .setFlowControlSettings(
               FlowControlSettings.newBuilder()
-                  .setMaxOutstandingElementCount(10000)
-                  .setMaxOutstandingRequestBytes(2048000)
+                  .setMaxOutstandingElementCount(100000)
+                  .setMaxOutstandingRequestBytes(10485760)
                   .setLimitExceededBehavior(LimitExceededBehavior.ThrowException)
                   .build());
       builder
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherSmokeTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherSmokeTest.java
deleted file mode 100644
index 004d9580cb6d..000000000000
--- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherSmokeTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2017, Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.cloud.pubsub.spi.v1;
-
-import com.google.pubsub.v1.Topic;
-import com.google.pubsub.v1.TopicName;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-@javax.annotation.Generated("by GAPIC")
-public class PublisherSmokeTest {
-  public static void main(String args[]) {
-    Logger.getLogger("").setLevel(Level.WARNING);
-    try {
-      Options options = new Options();
-      options.addOption("h", "help", false, "show usage");
-      options.addOption(
-          Option.builder()
-              .longOpt("project_id")
-              .desc("Project id")
-              .hasArg()
-              .argName("PROJECT-ID")
-              .required(true)
-              .build());
-      CommandLine cl = (new DefaultParser()).parse(options, args);
-      if (cl.hasOption("help")) {
-        HelpFormatter formater = new HelpFormatter();
-        formater.printHelp("PublisherSmokeTest", options);
-      }
-      executeNoCatch(cl.getOptionValue("project_id"));
-      System.out.println("OK");
-    } catch (Exception e) {
-      System.err.println("Failed with exception:");
-      e.printStackTrace(System.err);
-      System.exit(1);
-    }
-  }
-
-  public static void executeNoCatch(String projectId) throws Exception {
-    try (PublisherClient client = PublisherClient.create()) {
-      TopicName name = TopicName.create(projectId, "smoketesttopic-" + System.currentTimeMillis());
-
-      Topic response = client.createTopic(name);
-      System.out.println(
-          ReflectionToStringBuilder.toString(response, ToStringStyle.MULTI_LINE_STYLE));
-    }
-  }
-}
diff --git a/pom.xml b/pom.xml
index ee844891e030..207164f29494 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
     <github.global.server>github</github.global.server>
     <google.auth.version>0.6.0</google.auth.version>
     <grpc.version>1.0.3</grpc.version>
-    <gax.version>0.2.0</gax.version>
+    <gax.version>0.3.0</gax.version>
     <generatedProto.version>0.1.5</generatedProto.version>
     <core.version>0.9.5-alpha-SNAPSHOT</core.version>
     <beta.version>0.9.5-beta-SNAPSHOT</beta.version>