Minor spm.8 adjustments