diff --git a/runtime/local_jetty12/src/main/java/com/google/appengine/tools/development/jetty/JettyContainerService.java b/runtime/local_jetty12/src/main/java/com/google/appengine/tools/development/jetty/JettyContainerService.java
index 69cc0670..b745b9b9 100644
--- a/runtime/local_jetty12/src/main/java/com/google/appengine/tools/development/jetty/JettyContainerService.java
+++ b/runtime/local_jetty12/src/main/java/com/google/appengine/tools/development/jetty/JettyContainerService.java
@@ -443,7 +443,7 @@ public boolean accept(File dir, String name) {
           }
         });
     scanner.addListener(new ScannerListener());
-    scanner.doStart();
+    scanner.start();
   }
 
   @Override
diff --git a/runtime/local_jetty12_ee10/src/main/java/com/google/appengine/tools/development/jetty/ee10/JettyContainerService.java b/runtime/local_jetty12_ee10/src/main/java/com/google/appengine/tools/development/jetty/ee10/JettyContainerService.java
index 39f8649f..38660b73 100644
--- a/runtime/local_jetty12_ee10/src/main/java/com/google/appengine/tools/development/jetty/ee10/JettyContainerService.java
+++ b/runtime/local_jetty12_ee10/src/main/java/com/google/appengine/tools/development/jetty/ee10/JettyContainerService.java
@@ -447,7 +447,7 @@ public boolean accept(File dir, String name) {
           }
         });
     scanner.addListener(new ScannerListener());
-    scanner.doStart();
+    scanner.start();
   }
 
   @Override
diff --git a/runtime/local_jetty9/src/main/java/com/google/appengine/tools/development/jetty9/JettyContainerService.java b/runtime/local_jetty9/src/main/java/com/google/appengine/tools/development/jetty9/JettyContainerService.java
index 141084d4..9a0176da 100644
--- a/runtime/local_jetty9/src/main/java/com/google/appengine/tools/development/jetty9/JettyContainerService.java
+++ b/runtime/local_jetty9/src/main/java/com/google/appengine/tools/development/jetty9/JettyContainerService.java
@@ -69,6 +69,7 @@
 import org.eclipse.jetty.server.nio.NetworkTrafficSelectChannelConnector;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.Scanner;
+import org.eclipse.jetty.util.component.LifeCycle;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.webapp.WebAppContext;
 
@@ -420,7 +421,7 @@ public boolean accept(File dir, String name) {
           }
         });
     scanner.addListener(new ScannerListener());
-    scanner.doStart();
+    scanner.start();
   }
 
   @Override
@@ -463,7 +464,7 @@ private File getScanTarget() throws Exception {
     }
   }
 
-  private void fullWebAppScanner(int interval) throws IOException {
+  private void fullWebAppScanner(int interval) throws Exception {
     String webInf = context.getWebInf().getFile().getPath();
     List<File> scanList = new ArrayList<>();
     Collections.addAll(
@@ -488,7 +489,7 @@ public void filesChanged(List<String> changedFiles) throws Exception {
           }
         });
 
-    scanner.doStart();
+    scanner.start();
   }
 
   /**
diff --git a/runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/ee10/AppEngineWebAppContext.java b/runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/ee10/AppEngineWebAppContext.java
index 42d4b475..9e7a2634 100644
--- a/runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/ee10/AppEngineWebAppContext.java
+++ b/runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/ee10/AppEngineWebAppContext.java
@@ -167,7 +167,8 @@ public AppEngineWebAppContext(File appDir, String serverInfo, boolean extractWar
 
     setMaxFormContentSize(MAX_RESPONSE_SIZE);
 
-    addFilter(new ParseBlobUploadFilter(), "/*", EnumSet.allOf(DispatcherType.class));
+    // TODO: Can we change to a jetty-core handler? what to do on ASYNC?
+    addFilter(new ParseBlobUploadFilter(), "/*", EnumSet.of(DispatcherType.REQUEST));
     ignoreContentLength = isAppIdForNonContentLength();
   }