DS-1917 JSPUI validity fixes (several non-controversial fixes)