fixes for tomcat 7