Updates to support Tomcat 6+