fixes for tomcat 8