Eclipse fix + Servlet 2.5 fix