Updating some tomcat version specific code