Fixed tomcat build issues