Q2 cleanup for NCA; add full SRI terms