POM and web.xml updates