JSP releated fixes