- SPM fixes to SVP and cleanup process