Minor JSP improvements