Upgraded Tomcat and Bootstrap