tomcat fixes