updates for use with embedded tomcat