Tomcat deployment fixes