... fix tomcat issues