Updates for latest tomcat and new base packages