Tomcat 7 compatibility