Changed remaining settings to Java 6/Servlet 2.5