StandardServlet repairs