SSM 3.9 - cleaning and fixes