Fixed tomcat build errors