Fix SPM interfaces