More JSP updates