More fixes for Tomcat8