Servlet interop improvements