Fix issues with single Tomcat