Updates to JSP/war/modules as requested by hatRiot.