Changes to run on tomcat.