changes to tomcat 7