1. Cleanup. 2. Fixed setting muliple DSS-IDs.