Mass bugfix for Tomcat5