Tomcat fixes