Tomcat 7 compat