[SSM] Fix IOT-332, 333, 334 issues