Fixes for Tomcat6 problems