[SO] Port corrections for SM compatibility

No match.