A few more fixes to support Tomcat 8.