Config changes to adapt to Tomcat deployment