FIX: few fixes for DMS -> RSS