Adaptations to new Tomcat installation