Use old-style servlet mappings for Tomcat 6
Fix message duplication
Rearrange deck chairs