Port fixes to Tomcat as well