Fixes to web.xml