bug fixes for ssm