[SO] Port corrections for SM compatibility