Fixes for Tomcat8