Web xml parser fixes

This fixes a number of issues with the web.xml parser