Fixed tomcat startup issues