Fixes to SFC CSIT for neon-mri changes