Some JSP changes