More tomcat7 updates