Merge pull request #1415 from antonio-nino-diaz-arm/an/spm-fixes

Minor fixes to SPM