Fix issues with web.xml schema