More PRISM and GRADE fixes