changes for Tomcat 8