Fixed web.xml and servlet bugs