More fixes to get Travis happy with Tomcat.