[SSM] Fix IOT-322, 323 issues